8df49ad246
Add strlcpy / strlcat support to FORTIFY_SOURCE. This allows us to do consistency checks on to ensure we don't overflow buffers when the compiler is able to tell us the size of the buffer we're dealing with. Unlike previous changes, this change DOES NOT use the compiler's builtin support. Instead, we do everything the compiler would normally do. Change-Id: I47c099a911382452eafd711f8e9bfe7c2d0a0d22
56 lines
2.1 KiB
C
56 lines
2.1 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.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <private/logd.h>
|
|
|
|
/*
|
|
* __strlcpy_chk. Called in place of strlcpy() when we know the
|
|
* size of the buffer we're writing into.
|
|
*
|
|
* See
|
|
* http://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html
|
|
* http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
|
|
* for details.
|
|
*
|
|
* This strlcpy check is called if _FORTIFY_SOURCE is defined and
|
|
* greater than 0.
|
|
*/
|
|
size_t __strlcpy_chk(char *dest, const char *src,
|
|
size_t supplied_size, size_t dest_len_from_compiler)
|
|
{
|
|
if (supplied_size > dest_len_from_compiler) {
|
|
__libc_android_log_print(ANDROID_LOG_FATAL, "libc",
|
|
"*** strlcpy buffer overflow detected ***\n");
|
|
abort();
|
|
}
|
|
|
|
return strlcpy(dest, src, supplied_size);
|
|
}
|