diff options
Diffstat (limited to 'debug')
| -rw-r--r-- | debug/Makefile | 4 | ||||
| -rw-r--r-- | debug/chk_fail.c | 7 | ||||
| -rw-r--r-- | debug/fortify_fail.c | 34 | ||||
| -rw-r--r-- | debug/stack_chk_fail.c | 7 |
4 files changed, 40 insertions, 12 deletions
diff --git a/debug/Makefile b/debug/Makefile index 9d9b6ac96a..b9902cb4bf 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2001,2004,2005,2006 Free Software Foundation, Inc. +# Copyright (C) 1998-2001,2004,2005,2006,2007 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 @@ -42,7 +42,7 @@ routines = backtrace backtracesyms backtracesymsfd noophooks \ gethostname_chk getdomainname_chk wcrtomb_chk mbsnrtowcs_chk \ wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk mbstowcs_chk \ wcstombs_chk \ - stack_chk_fail \ + stack_chk_fail fortify_fail \ $(static-only-routines) static-only-routines := warning-nop stack_chk_fail_local diff --git a/debug/chk_fail.c b/debug/chk_fail.c index 0cfca295a9..bff17e4d3a 100644 --- a/debug/chk_fail.c +++ b/debug/chk_fail.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2005, 2007 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 @@ -26,9 +26,6 @@ void __attribute__ ((noreturn)) __chk_fail (void) { - /* The loop is added only to keep gcc happy. */ - while (1) - __libc_message (2, "*** buffer overflow detected ***: %s terminated\n", - __libc_argv[0] ?: "<unknown>"); + __fortify_fail ("buffer overflow detected"); } libc_hidden_def (__chk_fail) diff --git a/debug/fortify_fail.c b/debug/fortify_fail.c new file mode 100644 index 0000000000..66494a678f --- /dev/null +++ b/debug/fortify_fail.c @@ -0,0 +1,34 @@ +/* Copyright (C) 2007 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <stdio.h> +#include <stdlib.h> + + +extern char **__libc_argv attribute_hidden; + +void +__attribute__ ((noreturn)) +__fortify_fail (msg) + const char *msg; +{ + /* The loop is added only to keep gcc happy. */ + while (1) + __libc_message (2, "*** %s ***: %s terminated\n", + msg, __libc_argv[0] ?: "<unknown>"); +} diff --git a/debug/stack_chk_fail.c b/debug/stack_chk_fail.c index 298b323671..77e42f2dcb 100644 --- a/debug/stack_chk_fail.c +++ b/debug/stack_chk_fail.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2007 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 @@ -26,8 +26,5 @@ void __attribute__ ((noreturn)) __stack_chk_fail (void) { - /* The loop is added only to keep gcc happy. */ - while (1) - __libc_message (1, "*** stack smashing detected ***: %s terminated\n", - __libc_argv[0] ?: "<unknown>"); + __fortify_fail ("stack smashing detected"); } |