b83d6747fa
Our FORTIFY _chk functions' implementations were very repetitive and verbose but not very helpful. We'd also screwed up and put the SSIZE_MAX checks where they would never fire unless you actually had a buffer as large as half your address space, which probably doesn't happen very often. Factor out the duplication and take the opportunity to actually show details like how big the overrun buffer was, or by how much it was overrun. Also remove the obsolete FORTIFY event logging. Also remove the unused __libc_fatal_no_abort. This change doesn't improve the diagnostics from the optimized assembler implementations. Change-Id: I176a90701395404d50975b547a00bd2c654e1252
418 lines
15 KiB
C++
418 lines
15 KiB
C++
/*
|
|
* Copyright (C) 2012 The Android Open Source Project
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
/*
|
|
* Copyright (c) 1988 Regents of the University of California.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#undef _FORTIFY_SOURCE
|
|
|
|
#include <poll.h>
|
|
#include <stdarg.h>
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/cdefs.h>
|
|
#include <sys/select.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
|
|
#include "private/bionic_fortify.h"
|
|
|
|
//
|
|
// For more details see:
|
|
// http://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html
|
|
// http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
|
|
//
|
|
// TODO: add a link to similar clang documentation?
|
|
//
|
|
|
|
int __FD_ISSET_chk(int fd, fd_set* set, size_t set_size) {
|
|
__check_fd_set("FD_ISSET", fd, set_size);
|
|
return FD_ISSET(fd, set);
|
|
}
|
|
|
|
void __FD_CLR_chk(int fd, fd_set* set, size_t set_size) {
|
|
__check_fd_set("FD_CLR", fd, set_size);
|
|
FD_CLR(fd, set);
|
|
}
|
|
|
|
void __FD_SET_chk(int fd, fd_set* set, size_t set_size) {
|
|
__check_fd_set("FD_SET", fd, set_size);
|
|
FD_SET(fd, set);
|
|
}
|
|
|
|
char* __fgets_chk(char* dst, int supplied_size, FILE* stream, size_t dst_len_from_compiler) {
|
|
if (supplied_size < 0) {
|
|
__fortify_fatal("fgets: buffer size %d < 0", supplied_size);
|
|
}
|
|
__check_buffer_access("fgets", "write into", supplied_size, dst_len_from_compiler);
|
|
return fgets(dst, supplied_size, stream);
|
|
}
|
|
|
|
size_t __fread_chk(void* __restrict buf, size_t size, size_t count,
|
|
FILE* __restrict stream, size_t buf_size) {
|
|
size_t total;
|
|
if (__predict_false(__size_mul_overflow(size, count, &total))) {
|
|
// overflow: trigger the error path in fread
|
|
return fread(buf, size, count, stream);
|
|
}
|
|
__check_buffer_access("fread", "write into", total, buf_size);
|
|
return fread(buf, size, count, stream);
|
|
}
|
|
|
|
size_t __fwrite_chk(const void* __restrict buf, size_t size, size_t count,
|
|
FILE* __restrict stream, size_t buf_size) {
|
|
size_t total;
|
|
if (__predict_false(__size_mul_overflow(size, count, &total))) {
|
|
// overflow: trigger the error path in fwrite
|
|
return fwrite(buf, size, count, stream);
|
|
}
|
|
__check_buffer_access("fwrite", "read from", total, buf_size);
|
|
return fwrite(buf, size, count, stream);
|
|
}
|
|
|
|
extern char* __getcwd_chk(char* buf, size_t len, size_t actual_size) {
|
|
__check_buffer_access("getcwd", "write into", len, actual_size);
|
|
return getcwd(buf, len);
|
|
}
|
|
|
|
void* __memchr_chk(const void* s, int c, size_t n, size_t actual_size) {
|
|
__check_buffer_access("memchr", "read from", n, actual_size);
|
|
return memchr(s, c, n);
|
|
}
|
|
|
|
// Runtime implementation of __builtin____memmove_chk (used directly by compiler, not in headers).
|
|
extern "C" void* __memmove_chk(void* dst, const void* src, size_t len, size_t dst_len) {
|
|
__check_buffer_access("memmove", "write into", len, dst_len);
|
|
return memmove(dst, src, len);
|
|
}
|
|
|
|
void* __memrchr_chk(const void* s, int c, size_t n, size_t actual_size) {
|
|
__check_buffer_access("memrchr", "read from", n, actual_size);
|
|
return memrchr(s, c, n);
|
|
}
|
|
|
|
int __poll_chk(pollfd* fds, nfds_t fd_count, int timeout, size_t fds_size) {
|
|
__check_pollfd_array("poll", fds_size, fd_count);
|
|
return poll(fds, fd_count, timeout);
|
|
}
|
|
|
|
int __ppoll_chk(pollfd* fds, nfds_t fd_count, const timespec* timeout,
|
|
const sigset_t* mask, size_t fds_size) {
|
|
__check_pollfd_array("ppoll", fds_size, fd_count);
|
|
return ppoll(fds, fd_count, timeout, mask);
|
|
}
|
|
|
|
ssize_t __pread64_chk(int fd, void* buf, size_t count, off64_t offset, size_t buf_size) {
|
|
__check_count("pread64", "count", count);
|
|
__check_buffer_access("pread64", "write into", count, buf_size);
|
|
return pread64(fd, buf, count, offset);
|
|
}
|
|
|
|
ssize_t __pread_chk(int fd, void* buf, size_t count, off_t offset, size_t buf_size) {
|
|
__check_count("pread", "count", count);
|
|
__check_buffer_access("pread", "write into", count, buf_size);
|
|
return pread(fd, buf, count, offset);
|
|
}
|
|
|
|
ssize_t __pwrite64_chk(int fd, const void* buf, size_t count, off64_t offset,
|
|
size_t buf_size) {
|
|
__check_count("pwrite64", "count", count);
|
|
__check_buffer_access("pwrite64", "read from", count, buf_size);
|
|
return pwrite64(fd, buf, count, offset);
|
|
}
|
|
|
|
ssize_t __pwrite_chk(int fd, const void* buf, size_t count, off_t offset,
|
|
size_t buf_size) {
|
|
__check_count("pwrite", "count", count);
|
|
__check_buffer_access("pwrite", "read from", count, buf_size);
|
|
return pwrite(fd, buf, count, offset);
|
|
}
|
|
|
|
ssize_t __read_chk(int fd, void* buf, size_t count, size_t buf_size) {
|
|
__check_count("read", "count", count);
|
|
__check_buffer_access("read", "write into", count, buf_size);
|
|
return read(fd, buf, count);
|
|
}
|
|
|
|
ssize_t __readlinkat_chk(int dirfd, const char* path, char* buf, size_t size, size_t buf_size) {
|
|
__check_count("readlinkat", "size", size);
|
|
__check_buffer_access("readlinkat", "write into", size, buf_size);
|
|
return readlinkat(dirfd, path, buf, size);
|
|
}
|
|
|
|
ssize_t __readlink_chk(const char* path, char* buf, size_t size, size_t buf_size) {
|
|
__check_count("readlink", "size", size);
|
|
__check_buffer_access("readlink", "write into", size, buf_size);
|
|
return readlink(path, buf, size);
|
|
}
|
|
|
|
ssize_t __recvfrom_chk(int socket, void* buf, size_t len, size_t buf_size,
|
|
int flags, const sockaddr* src_addr,
|
|
socklen_t* addrlen) {
|
|
__check_buffer_access("recvfrom", "write into", len, buf_size);
|
|
return recvfrom(socket, buf, len, flags, src_addr, addrlen);
|
|
}
|
|
|
|
// Runtime implementation of __builtin____stpcpy_chk (used directly by compiler, not in headers)..
|
|
extern "C" char* __stpcpy_chk(char* dst, const char* src, size_t dst_len) {
|
|
// TODO: optimize so we don't scan src twice.
|
|
size_t src_len = strlen(src) + 1;
|
|
__check_buffer_access("stpcpy", "write into", src_len, dst_len);
|
|
return stpcpy(dst, src);
|
|
}
|
|
|
|
// Runtime implementation of __builtin____stpncpy_chk (used directly by compiler, not in headers).
|
|
extern "C" char* __stpncpy_chk(char* __restrict dst, const char* __restrict src,
|
|
size_t len, size_t dst_len) {
|
|
__check_buffer_access("stpncpy", "write into", len, dst_len);
|
|
return stpncpy(dst, src, len);
|
|
}
|
|
|
|
// This is a variant of __stpncpy_chk, but it also checks to make
|
|
// sure we don't read beyond the end of "src". The code for this is
|
|
// based on the original version of stpncpy, but modified to check
|
|
// how much we read from "src" at the end of the copy operation.
|
|
char* __stpncpy_chk2(char* __restrict dst, const char* __restrict src,
|
|
size_t n, size_t dst_len, size_t src_len) {
|
|
__check_buffer_access("stpncpy", "write into", n, dst_len);
|
|
if (n != 0) {
|
|
char* d = dst;
|
|
const char* s = src;
|
|
|
|
do {
|
|
if ((*d++ = *s++) == 0) {
|
|
// NUL pad the remaining n-1 bytes.
|
|
while (--n != 0) {
|
|
*d++ = 0;
|
|
}
|
|
break;
|
|
}
|
|
} while (--n != 0);
|
|
|
|
size_t s_copy_len = static_cast<size_t>(s - src);
|
|
if (__predict_false(s_copy_len > src_len)) {
|
|
__fortify_fatal("stpncpy: detected read past end of %zu-byte buffer", src_len);
|
|
}
|
|
}
|
|
|
|
return dst;
|
|
}
|
|
|
|
char* __strchr_chk(const char* p, int ch, size_t s_len) {
|
|
for (;; ++p, s_len--) {
|
|
if (__predict_false(s_len == 0)) {
|
|
__fortify_fatal("strchr: prevented read past end of buffer");
|
|
}
|
|
if (*p == static_cast<char>(ch)) {
|
|
return const_cast<char*>(p);
|
|
}
|
|
if (*p == '\0') {
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
size_t __strlcat_chk(char* dst, const char* src,
|
|
size_t supplied_size, size_t dst_len_from_compiler) {
|
|
__check_buffer_access("strlcat", "write into", supplied_size, dst_len_from_compiler);
|
|
return strlcat(dst, src, supplied_size);
|
|
}
|
|
|
|
size_t __strlcpy_chk(char* dst, const char* src,
|
|
size_t supplied_size, size_t dst_len_from_compiler) {
|
|
__check_buffer_access("strlcpy", "write into", supplied_size, dst_len_from_compiler);
|
|
return strlcpy(dst, src, supplied_size);
|
|
}
|
|
|
|
size_t __strlen_chk(const char* s, size_t s_len) {
|
|
// TODO: "prevented" here would be a lie because this strlen can run off the end.
|
|
// strlen is too important to be expensive, so we wanted to be able to call the optimized
|
|
// implementation, but I think we need to implement optimized assembler __strlen_chk routines.
|
|
size_t ret = strlen(s);
|
|
if (__predict_false(ret >= s_len)) {
|
|
__fortify_fatal("strlen: detected read past end of buffer");
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
// Runtime implementation of __builtin____strncat_chk (used directly by compiler, not in headers).
|
|
extern "C" char* __strncat_chk(char* __restrict dst, const char* __restrict src,
|
|
size_t len, size_t dst_buf_size) {
|
|
if (len == 0) {
|
|
return dst;
|
|
}
|
|
|
|
size_t dst_len = __strlen_chk(dst, dst_buf_size);
|
|
char* d = dst + dst_len;
|
|
dst_buf_size -= dst_len;
|
|
|
|
while (*src != '\0') {
|
|
*d++ = *src++;
|
|
len--; dst_buf_size--;
|
|
|
|
if (__predict_false(dst_buf_size == 0)) {
|
|
__fortify_fatal("strncat: prevented write past end of buffer");
|
|
}
|
|
|
|
if (len == 0) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
*d = '\0';
|
|
return dst;
|
|
}
|
|
|
|
// Runtime implementation of __builtin____strncpy_chk (used directly by compiler, not in headers).
|
|
extern "C" char* __strncpy_chk(char* __restrict dst, const char* __restrict src,
|
|
size_t len, size_t dst_len) {
|
|
__check_buffer_access("strncpy", "write into", len, dst_len);
|
|
return strncpy(dst, src, len);
|
|
}
|
|
|
|
// This is a variant of __strncpy_chk, but it also checks to make
|
|
// sure we don't read beyond the end of "src". The code for this is
|
|
// based on the original version of strncpy, but modified to check
|
|
// how much we read from "src" at the end of the copy operation.
|
|
char* __strncpy_chk2(char* __restrict dst, const char* __restrict src,
|
|
size_t n, size_t dst_len, size_t src_len) {
|
|
__check_buffer_access("strncpy", "write into", n, dst_len);
|
|
if (n != 0) {
|
|
char* d = dst;
|
|
const char* s = src;
|
|
|
|
do {
|
|
if ((*d++ = *s++) == 0) {
|
|
// NUL pad the remaining n-1 bytes.
|
|
while (--n != 0) {
|
|
*d++ = 0;
|
|
}
|
|
break;
|
|
}
|
|
} while (--n != 0);
|
|
|
|
size_t s_copy_len = static_cast<size_t>(s - src);
|
|
if (__predict_false(s_copy_len > src_len)) {
|
|
__fortify_fatal("strncpy: detected read past end of %zu-byte buffer", src_len);
|
|
}
|
|
}
|
|
|
|
return dst;
|
|
}
|
|
|
|
char* __strrchr_chk(const char* p, int ch, size_t s_len) {
|
|
for (const char* save = NULL;; ++p, s_len--) {
|
|
if (s_len == 0) {
|
|
__fortify_fatal("strrchr: prevented read past end of buffer");
|
|
}
|
|
if (*p == static_cast<char>(ch)) {
|
|
save = p;
|
|
}
|
|
if (!*p) {
|
|
return const_cast<char*>(save);
|
|
}
|
|
}
|
|
}
|
|
|
|
mode_t __umask_chk(mode_t mode) {
|
|
if (__predict_false((mode & 0777) != mode)) {
|
|
__fortify_fatal("umask: called with invalid mask %o", mode);
|
|
}
|
|
|
|
return umask(mode);
|
|
}
|
|
|
|
// Runtime implementation of __builtin____vsnprintf_chk (used directly by compiler, not in headers).
|
|
extern "C" int __vsnprintf_chk(char* dst, size_t supplied_size, int /*flags*/,
|
|
size_t dst_len_from_compiler, const char* format, va_list va) {
|
|
__check_buffer_access("vsnprintf", "write into", supplied_size, dst_len_from_compiler);
|
|
return vsnprintf(dst, supplied_size, format, va);
|
|
}
|
|
|
|
// Runtime implementation of __builtin____snprintf_chk (used directly by compiler, not in headers).
|
|
extern "C" int __snprintf_chk(char* dst, size_t supplied_size, int flags,
|
|
size_t dst_len_from_compiler, const char* format, ...) {
|
|
va_list va;
|
|
va_start(va, format);
|
|
int result = __vsnprintf_chk(dst, supplied_size, flags, dst_len_from_compiler, format, va);
|
|
va_end(va);
|
|
return result;
|
|
}
|
|
|
|
// Runtime implementation of __builtin____vsprintf_chk (used directly by compiler, not in headers).
|
|
extern "C" int __vsprintf_chk(char* dst, int /*flags*/,
|
|
size_t dst_len_from_compiler, const char* format, va_list va) {
|
|
int result = vsnprintf(dst, dst_len_from_compiler, format, va);
|
|
__check_buffer_access("vsprintf", "write into", result + 1, dst_len_from_compiler);
|
|
return result;
|
|
}
|
|
|
|
// Runtime implementation of __builtin____sprintf_chk (used directly by compiler, not in headers).
|
|
extern "C" int __sprintf_chk(char* dst, int flags, size_t dst_len_from_compiler,
|
|
const char* format, ...) {
|
|
va_list va;
|
|
va_start(va, format);
|
|
int result = __vsprintf_chk(dst, flags, dst_len_from_compiler, format, va);
|
|
va_end(va);
|
|
return result;
|
|
}
|
|
|
|
ssize_t __write_chk(int fd, const void* buf, size_t count, size_t buf_size) {
|
|
__check_count("write", "count", count);
|
|
__check_buffer_access("write", "read from", count, buf_size);
|
|
return write(fd, buf, count);
|
|
}
|