diff options
author | Nick Kralevich <nnk@google.com> | 2012-06-07 14:01:26 -0700 |
---|---|---|
committer | Nick Kralevich <nnk@google.com> | 2012-06-07 14:19:52 -0700 |
commit | 71a18dd435e96564539b5af71b8ea5093a2109a1 (patch) | |
tree | fd59c2a7cc23b663d090b0b8843a5d19c97df7d0 /libc/string | |
parent | 7d11009a970732ea18f8a0599d63c94eab9ec3f0 (diff) | |
download | bionic-71a18dd435e96564539b5af71b8ea5093a2109a1.zip bionic-71a18dd435e96564539b5af71b8ea5093a2109a1.tar.gz bionic-71a18dd435e96564539b5af71b8ea5093a2109a1.tar.bz2 |
_FORTIFY_SOURCE: add memset / bzero support
Add _FORTIFY_SOURCE support for the following functions:
* memset
* bzero
Move the __BIONIC_FORTIFY_INLINE definition to cdefs.h so it
can be used from multiple header files.
Change-Id: Iead4d5e35de6ec97786d58ee12573f9b11135bb7
Diffstat (limited to 'libc/string')
-rw-r--r-- | libc/string/__memset_chk.c | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/libc/string/__memset_chk.c b/libc/string/__memset_chk.c new file mode 100644 index 0000000..1ccfd46 --- /dev/null +++ b/libc/string/__memset_chk.c @@ -0,0 +1,53 @@ +/* + * 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> + +/* + * Runtime implementation of __builtin____memset_chk. + * + * 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 memset check is called if _FORTIFY_SOURCE is defined and + * greater than 0. + */ +void *__memset_chk (void *dest, int c, size_t n, size_t dest_len) +{ + if (n > dest_len) { + __libc_android_log_print(ANDROID_LOG_FATAL, "libc", + "*** memset buffer overflow detected ***\n"); + abort(); + } + + return memset(dest, c, n); +} |