diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-07-11 07:44:01 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-07-11 07:44:14 -0700 |
| commit | ed421fca42fd9b4cab7c66e77894b8dd7ca57ed0 (patch) | |
| tree | f1131793bd3340ada62e6d31434e1d8003eec2fd /include/stdio.h | |
| parent | 94070f86c0c849c71ed2e7e2189bb4d1f7411a17 (diff) | |
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 <stdbool.h>.
(_fortify_fail_abort): New function.
(__fortify_fail): Call _fortify_fail_abort.
(__fortify_fail_abort): Add a hidden definition.
* debug/stack_chk_fail.c: Include <stdbool.h>.
(__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.
Diffstat (limited to 'include/stdio.h')
| -rw-r--r-- | include/stdio.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/stdio.h b/include/stdio.h index f68f633bd6..215f919990 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -86,13 +86,24 @@ extern int __gen_tempname (char *__tmpl, int __suffixlen, int __flags, # define __GT_DIR 1 /* create a directory */ # define __GT_NOCREATE 2 /* just find a name not currently in use */ +enum __libc_message_action +{ + do_message = 0, /* Print message. */ + do_abort = 1 << 0, /* Abort. */ + do_backtrace = 1 << 1 /* Backtrace. */ +}; + /* Print out MESSAGE on the error output and abort. */ extern void __libc_fatal (const char *__message) __attribute__ ((__noreturn__)); -extern void __libc_message (int do_abort, const char *__fnt, ...); +extern void __libc_message (enum __libc_message_action action, + const char *__fnt, ...); extern void __fortify_fail (const char *msg) __attribute__ ((__noreturn__)) internal_function; +extern void __fortify_fail_abort (_Bool, const char *msg) + __attribute__ ((__noreturn__)) internal_function; libc_hidden_proto (__fortify_fail) +libc_hidden_proto (__fortify_fail_abort) /* Acquire ownership of STREAM. */ extern void __flockfile (FILE *__stream); |