From ed421fca42fd9b4cab7c66e77894b8dd7ca57ed0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 11 Jul 2017 07:44:01 -0700 Subject: Avoid backtrace from __stack_chk_fail [BZ #12189] __stack_chk_fail is called on corrupted stack. Stack backtrace is very unreliable against corrupted stack. __libc_message is changed to accept enum __libc_message_action and call BEFORE_ABORT only if action includes do_backtrace. __fortify_fail_abort is added to avoid backtrace from __stack_chk_fail. [BZ #12189] * debug/Makefile (CFLAGS-tst-ssp-1.c): New. (tests): Add tst-ssp-1 if -fstack-protector works. * debug/fortify_fail.c: Include . (_fortify_fail_abort): New function. (__fortify_fail): Call _fortify_fail_abort. (__fortify_fail_abort): Add a hidden definition. * debug/stack_chk_fail.c: Include . (__stack_chk_fail): Call __fortify_fail_abort, instead of __fortify_fail. * debug/tst-ssp-1.c: New file. * include/stdio.h (__libc_message_action): New enum. (__libc_message): Replace int with enum __libc_message_action. (__fortify_fail_abort): New hidden prototype. * malloc/malloc.c (malloc_printerr): Update __libc_message calls. * sysdeps/posix/libc_fatal.c (__libc_message): Replace int with enum __libc_message_action. Call BEFORE_ABORT only if action includes do_backtrace. (__libc_fatal): Update __libc_message call. --- debug/stack_chk_fail.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debug/stack_chk_fail.c') diff --git a/debug/stack_chk_fail.c b/debug/stack_chk_fail.c index 4f7346481d..9ab9bc7ceb 100644 --- a/debug/stack_chk_fail.c +++ b/debug/stack_chk_fail.c @@ -17,6 +17,7 @@ #include #include +#include extern char **__libc_argv attribute_hidden; @@ -25,7 +26,7 @@ void __attribute__ ((noreturn)) __stack_chk_fail (void) { - __fortify_fail ("stack smashing detected"); + __fortify_fail_abort (false, "stack smashing detected"); } strong_alias (__stack_chk_fail, __stack_chk_fail_local) -- cgit v1.2.3