aboutsummaryrefslogtreecommitdiff
path: root/debug
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-05-24 23:55:28 +0000
committerUlrich Drepper <drepper@redhat.com>2007-05-24 23:55:28 +0000
commitddfd0535776c47ec01231ac91fabe8b2e128cfa3 (patch)
tree1052c9c568ae6f734290034e8ea566d396b71a13 /debug
parent5a8075b116280d0c1ece277e4be75250efca45b2 (diff)
downloadglibc-ddfd0535776c47ec01231ac91fabe8b2e128cfa3.zip
glibc-ddfd0535776c47ec01231ac91fabe8b2e128cfa3.tar.gz
glibc-ddfd0535776c47ec01231ac91fabe8b2e128cfa3.tar.bz2
* Makerules (sysd-rules): Define PTW for ptw-* files.
* Versions: Define GLIBC_2.7 for libc. * include/stdio.h: Declare __fortify_fail. * debug/fortify_fail.c: New file. * debug/Makefile (routines): Add fortify_fail. * debug/chk_fail.c: Use __fortify_fail. * debug/stack_chk_fail.c: Likewise. * io/Versions: Export __open_2, __open64_2, __openat_2, and __openat64_2 for GLIBC_2.7. * io/fcntl.h: When compiling with fortification, include bits/fcntl2.h. * io/open.c: Define *_2 variant of function which checks for O_CREAT and fails if necessary. * io/open64.c: Likewise. * io/openat.c: Likewise. * io/openat64.c: Likewise. * sysdeps/unix/sysv/linux/open64.c: Likewise. * sysdeps/unix/sysv/linux/openat.c: Likewise. * sysdeps/unix/sysv/linux/openat64.c: Likewise. * io/bits/fcntl2.h: New file. * include/fcntl.h: Declare __open_2, __open64_2, __openat_2, and __openat64_2. * include/bits/fcntl2.h: New file. * sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): Add open_2. * sysdeps/unix/sysv/linux/open_2.c: New file.
Diffstat (limited to 'debug')
-rw-r--r--debug/Makefile4
-rw-r--r--debug/chk_fail.c7
-rw-r--r--debug/fortify_fail.c34
-rw-r--r--debug/stack_chk_fail.c7
4 files changed, 40 insertions, 12 deletions
diff --git a/debug/Makefile b/debug/Makefile
index 9d9b6ac..b9902cb 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 0cfca29..bff17e4 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 0000000..66494a6
--- /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 298b323..77e42f2 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");
}