From fb7eb5e07f43587c2bedf2aaa53b21fa002417bb Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 14 Feb 2013 14:37:34 -0800 Subject: [PATCH] Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces. Bug: 2487269 Change-Id: Iec5e470fc22cd9108404f634a9d4baa2c7b7f58f --- libc/Android.mk | 2 +- libc/bionic/__stack_chk_fail.cpp | 38 ++++++++++++++ .../bionic/{ssp.cpp => __stack_chk_guard.cpp} | 49 +------------------ libc/bionic/pthread.c | 1 - libc/private/bionic_ssp.h | 3 ++ tests/stack_protector_test.cpp | 2 +- 6 files changed, 45 insertions(+), 50 deletions(-) create mode 100644 libc/bionic/__stack_chk_fail.cpp rename libc/bionic/{ssp.cpp => __stack_chk_guard.cpp} (56%) diff --git a/libc/Android.mk b/libc/Android.mk index f78cf2c86..83d8e594d 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -725,7 +725,7 @@ WITH_MALLOC_CHECK_LIBC_A := $(strip $(WITH_MALLOC_CHECK_LIBC_A)) include $(CLEAR_VARS) -LOCAL_SRC_FILES := bionic/ssp.cpp +LOCAL_SRC_FILES := bionic/__stack_chk_fail.cpp bionic/__stack_chk_guard.cpp LOCAL_CFLAGS := $(libc_common_cflags) -fno-stack-protector -Werror LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_MODULE := libbionic_ssp diff --git a/libc/bionic/__stack_chk_fail.cpp b/libc/bionic/__stack_chk_fail.cpp new file mode 100644 index 000000000..cae66b10a --- /dev/null +++ b/libc/bionic/__stack_chk_fail.cpp @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2008 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 + +#include "bionic_ssp.h" +#include "debug_format.h" +#include "logd.h" + +void __stack_chk_fail() { + __libc_format_log(ANDROID_LOG_FATAL, "libc", "stack corruption detected"); + abort(); +} diff --git a/libc/bionic/ssp.cpp b/libc/bionic/__stack_chk_guard.cpp similarity index 56% rename from libc/bionic/ssp.cpp rename to libc/bionic/__stack_chk_guard.cpp index 3b7a1ff47..a695cafbb 100644 --- a/libc/bionic/ssp.cpp +++ b/libc/bionic/__stack_chk_guard.cpp @@ -26,17 +26,9 @@ * SUCH DAMAGE. */ -#include -#include -#include -#include -#include -#include -#include -#include - #include "bionic_ssp.h" -#include "logd.h" + +#include uintptr_t __stack_chk_guard = 0; @@ -44,40 +36,3 @@ static void __attribute__((constructor)) __init_stack_check_guard() { // AT_RANDOM is a pointer to 16 bytes of randomness on the stack. __stack_chk_guard = *reinterpret_cast(getauxval(AT_RANDOM)); } - -// This is the crash handler. -// Does a best effort at logging and calls _exit to terminate -// the process immediately (without atexit handlers, etc.). -void __stack_chk_fail() { - // Immediately block all (but SIGABRT) signal handlers from running code. - sigset_t sigmask; - sigfillset(&sigmask); - sigdelset(&sigmask, SIGABRT); - sigprocmask(SIG_BLOCK, &sigmask, NULL); - - // Use /proc/self/exe link to obtain the program name for logging - // purposes. If it's not available, we set it to "". - char path[PATH_MAX]; - int count; - if ((count = readlink("/proc/self/exe", path, sizeof(path) - 1)) == -1) { - strlcpy(path, "", sizeof(path)); - } else { - path[count] = '\0'; - } - - // Do a best effort at logging. - __libc_android_log_write(ANDROID_LOG_FATAL, path, "stack corruption detected: aborted"); - - // Make sure there is no default action for SIGABRT. - struct sigaction sa; - memset(&sa, 0, sizeof(sa)); - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - sa.sa_handler = SIG_DFL; - sigaction(SIGABRT, &sa, NULL); - - // Terminate the process and exit immediately. - kill(getpid(), SIGABRT); - - _exit(127); -} diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c index d5f818744..59fb8b3c5 100644 --- a/libc/bionic/pthread.c +++ b/libc/bionic/pthread.c @@ -36,7 +36,6 @@ #include "bionic_atomic_inline.h" #include "bionic_futex.h" #include "bionic_pthread.h" -#include "bionic_ssp.h" #include "bionic_tls.h" #include "pthread_internal.h" #include "thread_private.h" diff --git a/libc/private/bionic_ssp.h b/libc/private/bionic_ssp.h index d34b6ab6a..9883d7210 100644 --- a/libc/private/bionic_ssp.h +++ b/libc/private/bionic_ssp.h @@ -29,6 +29,9 @@ #ifndef _PRIVATE_SSP_H #define _PRIVATE_SSP_H +#include +#include + __BEGIN_DECLS /* GCC uses this on ARM and MIPS; we use it on x86 to set the guard in TLS. */ diff --git a/tests/stack_protector_test.cpp b/tests/stack_protector_test.cpp index 664a11e7b..97d5ad62e 100644 --- a/tests/stack_protector_test.cpp +++ b/tests/stack_protector_test.cpp @@ -36,7 +36,7 @@ pid_t gettid() { return syscall(__NR_gettid); } #ifdef __i386__ -// For x86, bionic and glibc have per-thread stack guard values. +// For x86, bionic and glibc have per-thread stack guard values (all identical). static uint32_t GetGuardFromTls() { uint32_t guard;