summaryrefslogtreecommitdiff
path: root/debug/fortify_fail.c
diff options
context:
space:
mode:
Diffstat (limited to 'debug/fortify_fail.c')
-rw-r--r--debug/fortify_fail.c27
1 files changed, 21 insertions, 6 deletions
diff --git a/debug/fortify_fail.c b/debug/fortify_fail.c
index 71980779bc..ef6a39d151 100644
--- a/debug/fortify_fail.c
+++ b/debug/fortify_fail.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2016 Free Software Foundation, Inc.
+/* Copyright (C) 2007-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,17 +17,32 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
extern char **__libc_argv attribute_hidden;
void
-__attribute__ ((noreturn)) internal_function
-__fortify_fail (const char *msg)
+__attribute__ ((noreturn))
+__fortify_fail_abort (_Bool need_backtrace, const char *msg)
{
- /* The loop is added only to keep gcc happy. */
+ /* The loop is added only to keep gcc happy. Don't pass down
+ __libc_argv[0] if we aren't doing backtrace since __libc_argv[0]
+ may point to the corrupted stack. */
while (1)
- __libc_message (2, "*** %s ***: %s terminated\n",
- msg, __libc_argv[0] ?: "<unknown>");
+ __libc_message (need_backtrace ? (do_abort | do_backtrace) : do_abort,
+ "*** %s ***: %s terminated\n",
+ msg,
+ (need_backtrace && __libc_argv[0] != NULL
+ ? __libc_argv[0] : "<unknown>"));
}
+
+void
+__attribute__ ((noreturn))
+__fortify_fail (const char *msg)
+{
+ __fortify_fail_abort (true, msg);
+}
+
libc_hidden_def (__fortify_fail)
+libc_hidden_def (__fortify_fail_abort)