[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r2280 - in /fsf/trunk/libc: ./ debug/ include/ include/bits/ io/ io/bits/ nptl/ nptl/sysdeps/i386/ nptl/sysdeps/powerpc/ npt...
- To: commits@xxxxxxxxxx
- Subject: [commits] r2280 - in /fsf/trunk/libc: ./ debug/ include/ include/bits/ io/ io/bits/ nptl/ nptl/sysdeps/i386/ nptl/sysdeps/powerpc/ npt...
- From: eglibc@xxxxxxxxxx
- Date: Fri, 25 May 2007 07:03:58 -0000
Author: eglibc
Date: Fri May 25 00:03:57 2007
New Revision: 2280
Log:
Import glibc-mainline for 2007-05-25
Added:
fsf/trunk/libc/debug/fortify_fail.c
fsf/trunk/libc/include/bits/fcntl2.h
fsf/trunk/libc/io/bits/
fsf/trunk/libc/io/bits/fcntl2.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/open_2.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/Makerules
fsf/trunk/libc/Versions.def
fsf/trunk/libc/debug/Makefile
fsf/trunk/libc/debug/chk_fail.c
fsf/trunk/libc/debug/stack_chk_fail.c
fsf/trunk/libc/include/fcntl.h
fsf/trunk/libc/include/stdio.h
fsf/trunk/libc/io/Versions
fsf/trunk/libc/io/fcntl.h
fsf/trunk/libc/io/open.c
fsf/trunk/libc/io/open64.c
fsf/trunk/libc/io/openat.c
fsf/trunk/libc/io/openat64.c
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/allocatestack.c
fsf/trunk/libc/nptl/init.c
fsf/trunk/libc/nptl/sysdeps/i386/tls.h
fsf/trunk/libc/nptl/sysdeps/powerpc/tls.h
fsf/trunk/libc/nptl/sysdeps/x86_64/tls.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/Makefile
fsf/trunk/libc/sysdeps/unix/sysv/linux/open64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/openat.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/openat64.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri May 25 00:03:57 2007
@@ -1,3 +1,31 @@
+2007-05-24 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * 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.
+
2007-05-21 Ulrich Drepper <drepper@xxxxxxxxxx>
* sysdeps/x86_64/cacheinfo.c (init_cacheinfo): Pass correct value
Modified: fsf/trunk/libc/Makerules
==============================================================================
--- fsf/trunk/libc/Makerules (original)
+++ fsf/trunk/libc/Makerules Fri May 25 00:03:57 2007
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+# Copyright (C) 1991-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
@@ -240,9 +240,9 @@
echo "\$$(objpfx)rtld-%$$o: $$dir/%.s \$$(before-compile); \
\$$(compile-command.s)"; \
echo "\$$(objpfx)ptw-%$$o: $$dir/%.S \$$(before-compile); \
- \$$(compile-command.S)"; \
+ \$$(compile-command.S) -DPTW"; \
echo "\$$(objpfx)ptw-%$$o: $$dir/%.s \$$(before-compile); \
- \$$(compile-command.s)"; \
+ \$$(compile-command.s) -DPTW"; \
echo "\$$(objpfx)m_%$$o: $$dir/s_%.S \$$(before-compile); \
\$$(compile-command.S)"; \
echo "\$$(objpfx)m_%$$o: $$dir/s_%.s \$$(before-compile); \
@@ -253,7 +253,7 @@
echo "\$$(objpfx)rtld-%$$o: $$dir/%.c \$$(before-compile); \
\$$(compile-command.c)"; \
echo "\$$(objpfx)ptw-%$$o: $$dir/%.c \$$(before-compile); \
- \$$(compile-command.c)"; \
+ \$$(compile-command.c) -DPTW"; \
echo "\$$(objpfx)m_%$$o: $$dir/s_%.c \$$(before-compile); \
\$$(compile-command.c)"; \
done; \
Modified: fsf/trunk/libc/Versions.def
==============================================================================
--- fsf/trunk/libc/Versions.def (original)
+++ fsf/trunk/libc/Versions.def Fri May 25 00:03:57 2007
@@ -23,6 +23,7 @@
GLIBC_2.4
GLIBC_2.5
GLIBC_2.6
+ GLIBC_2.7
%ifdef USE_IN_LIBIO
HURD_CTHREADS_0.3
%endif
Modified: fsf/trunk/libc/debug/Makefile
==============================================================================
--- fsf/trunk/libc/debug/Makefile (original)
+++ fsf/trunk/libc/debug/Makefile Fri May 25 00:03:57 2007
@@ -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 @@
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
Modified: fsf/trunk/libc/debug/chk_fail.c
==============================================================================
--- fsf/trunk/libc/debug/chk_fail.c (original)
+++ fsf/trunk/libc/debug/chk_fail.c Fri May 25 00:03:57 2007
@@ -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 @@
__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)
Added: fsf/trunk/libc/debug/fortify_fail.c
==============================================================================
--- fsf/trunk/libc/debug/fortify_fail.c (added)
+++ fsf/trunk/libc/debug/fortify_fail.c Fri May 25 00:03:57 2007
@@ -1,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>");
+}
Modified: fsf/trunk/libc/debug/stack_chk_fail.c
==============================================================================
--- fsf/trunk/libc/debug/stack_chk_fail.c (original)
+++ fsf/trunk/libc/debug/stack_chk_fail.c Fri May 25 00:03:57 2007
@@ -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 @@
__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");
}
Added: fsf/trunk/libc/include/bits/fcntl2.h
==============================================================================
--- fsf/trunk/libc/include/bits/fcntl2.h (added)
+++ fsf/trunk/libc/include/bits/fcntl2.h Fri May 25 00:03:57 2007
@@ -1,0 +1,1 @@
+#include "../../io/bits/fcntl2.h"
Modified: fsf/trunk/libc/include/fcntl.h
==============================================================================
--- fsf/trunk/libc/include/fcntl.h (original)
+++ fsf/trunk/libc/include/fcntl.h Fri May 25 00:03:57 2007
@@ -24,6 +24,11 @@
__nonnull ((2));
libc_hidden_proto (__openat64)
+extern int __open_2 (__const char *__path, int __oflag);
+extern int __open64_2 (__const char *__path, int __oflag);
+extern int __openat_2 (int __fd, __const char *__path, int __oflag);
+extern int __openat64_2 (int __fd, __const char *__path, int __oflag);
+
/* Helper functions for the various *at functions. For Linux. */
extern void __atfct_seterrno (int errval, int fd, const char *buf)
Modified: fsf/trunk/libc/include/stdio.h
==============================================================================
--- fsf/trunk/libc/include/stdio.h (original)
+++ fsf/trunk/libc/include/stdio.h Fri May 25 00:03:57 2007
@@ -65,6 +65,7 @@
extern void __libc_fatal (__const char *__message)
__attribute__ ((__noreturn__));
extern void __libc_message (int do_abort, __const char *__fnt, ...);
+extern void __fortify_fail (const char *msg) __attribute__ ((noreturn));
/* Acquire ownership of STREAM. */
extern void __flockfile (FILE *__stream);
Modified: fsf/trunk/libc/io/Versions
==============================================================================
--- fsf/trunk/libc/io/Versions (original)
+++ fsf/trunk/libc/io/Versions Fri May 25 00:03:57 2007
@@ -116,4 +116,7 @@
GLIBC_2.6 {
utimensat; futimens;
}
+ GLIBC_2.7 {
+ __open_2; __open64_2; __openat_2; __openat64_2;
+ }
}
Added: fsf/trunk/libc/io/bits/fcntl2.h
==============================================================================
--- fsf/trunk/libc/io/bits/fcntl2.h (added)
+++ fsf/trunk/libc/io/bits/fcntl2.h Fri May 25 00:03:57 2007
@@ -1,0 +1,155 @@
+/* Checking macros for fcntl functions.
+ 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. */
+
+#ifndef _FCNTL_H
+# error "Never include <bits/fcntl2.h> directly; use <fcntl.h> instead."
+#endif
+
+/* Check that calls to open and openat with O_CREAT set have an
+ appropriate third/fourth parameter. */
+#ifndef __USE_FILE_OFFSET64
+extern int __open_2 (__const char *__path, int __oflag);
+#else
+extern int __REDIRECT (__open_2, (__const char *__file, int __oflag),
+ __open64_2) __nonnull ((1));
+#endif
+
+#define open(fname, flags, ...) \
+ ({ int ___r; \
+ /* If the compiler complains about an invalid type, excess elements, etc \
+ in the initialization this means a paraleter of the wrong type has \
+ been passed to open. */ \
+ int ___arr[] = { __VA_ARGS__ }; \
+ if (__builtin_constant_p (flags) && ((flags) & O_CREAT) != 0) \
+ { \
+ /* If the compile complains about the size of this array type the \
+ the mode parameter is missing since O_CREAT has been used. */ \
+ typedef int __open_missing_mode[((flags) & O_CREAT) != 0 \
+ ? ((long int) sizeof (___arr) \
+ - (long int) sizeof (int)) : 1]; \
+ } \
+ if (sizeof (___arr) == 0) \
+ ___r = __open_2 (fname, flags); \
+ else \
+ { \
+ /* If the compile complains about the size of this array type too \
+ many parameters have been passed to open. */ \
+ typedef int __open_too_many_args[-(sizeof (___arr) > sizeof (int))]; \
+ ___r = open (fname, flags, ___arr[0]); \
+ } \
+ ___r; \
+ })
+
+
+#ifdef __USE_LARGEFILE64
+extern int __open64_2 (__const char *__path, int __oflag);
+
+# define open64(fname, flags, ...) \
+ ({ int ___r; \
+ /* If the compiler complains about an invalid type, excess elements, etc \
+ in the initialization this means a paraleter of the wrong type has \
+ been passed to open64. */ \
+ int ___arr[] = { __VA_ARGS__ }; \
+ if (__builtin_constant_p (flags) && ((flags) & O_CREAT) != 0) \
+ { \
+ /* If the compile complains about the size of this array type the \
+ the mode parameter is missing since O_CREAT has been used. */ \
+ typedef int __open_missing_mode[((flags) & O_CREAT) != 0 \
+ ? ((long int) sizeof (___arr) \
+ - (long int) sizeof (int)) : 1]; \
+ } \
+ if (sizeof (___arr) == 0) \
+ ___r = __open64_2 (fname, flags); \
+ else \
+ { \
+ /* If the compile complains about the size of this array type too \
+ many parameters have been passed to open64. */ \
+ typedef int __open_too_many_args[-(sizeof (___arr) > sizeof (int))]; \
+ ___r = open64 (fname, flags, ___arr[0]); \
+ } \
+ ___r; \
+ })
+#endif
+
+#ifdef __USE_ATFILE
+# ifndef __USE_FILE_OFFSET64
+extern int __openat_2 (int __fd, __const char *__path, int __oflag);
+# else
+extern int __REDIRECT (__openat_2, (int __fd, __const char *__file,
+ int __oflag), __openat64_2)
+ __nonnull ((1));
+# endif
+
+# define openat(fd, fname, flags, ...) \
+ ({ int ___r; \
+ /* If the compiler complains about an invalid type, excess elements, etc \
+ in the initialization this means a paraleter of the wrong type has \
+ been passed to openat. */ \
+ int ___arr[] = { __VA_ARGS__ }; \
+ if (__builtin_constant_p (flags) && ((flags) & O_CREAT) != 0) \
+ { \
+ /* If the compile complains about the size of this array type the \
+ the mode parameter is missing since O_CREAT has been used. */ \
+ typedef int __open_missing_mode[((flags) & O_CREAT) != 0 \
+ ? ((long int) sizeof (___arr) \
+ - (long int) sizeof (int)) : 1]; \
+ } \
+ if (sizeof (___arr) == 0) \
+ ___r = __openat_2 (fd, fname, flags); \
+ else \
+ { \
+ /* If the compile complains about the size of this array type too \
+ many parameters have been passed to openat. */ \
+ typedef int __open_too_many_args[-(sizeof (___arr) > sizeof (int))]; \
+ ___r = openat (fd, fname, flags, ___arr[0]); \
+ } \
+ ___r; \
+ })
+
+
+# ifdef __USE_LARGEFILE64
+extern int __openat64_2 (int __fd, __const char *__path, int __oflag);
+
+# define openat64(fd, fname, flags, ...) \
+ ({ int ___r; \
+ /* If the compiler complains about an invalid type, excess elements, etc \
+ in the initialization this means a paraleter of the wrong type has \
+ been passed to openat64. */ \
+ int ___arr[] = { __VA_ARGS__ }; \
+ if (__builtin_constant_p (flags) && ((flags) & O_CREAT) != 0) \
+ { \
+ /* If the compile complains about the size of this array type the \
+ the mode parameter is missing since O_CREAT has been used. */ \
+ typedef int __open_missing_mode[((flags) & O_CREAT) != 0 \
+ ? ((long int) sizeof (___arr) \
+ - (long int) sizeof (int)) : 1]; \
+ } \
+ if (sizeof (___arr) == 0) \
+ ___r = __openat64_2 (fd, fname, flags); \
+ else \
+ { \
+ /* If the compile complains about the size of this array type too \
+ many parameters have been passed to openat. */ \
+ typedef int __open_too_many_args[-(sizeof (___arr) > sizeof (int))]; \
+ ___r = openat64 (fd, fname, flags, ___arr[0]); \
+ } \
+ ___r; \
+ })
+# endif
+#endif
Modified: fsf/trunk/libc/io/fcntl.h
==============================================================================
--- fsf/trunk/libc/io/fcntl.h (original)
+++ fsf/trunk/libc/io/fcntl.h Fri May 25 00:03:57 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006
+/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006,2007
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -210,6 +210,12 @@
# endif
#endif
+
+/* Define some macros helping to catch common problems. */
+#if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus
+# include <bits/fcntl2.h>
+#endif
+
__END_DECLS
#endif /* fcntl.h */
Modified: fsf/trunk/libc/io/open.c
==============================================================================
--- fsf/trunk/libc/io/open.c (original)
+++ fsf/trunk/libc/io/open.c Fri May 25 00:03:57 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,2002,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
@@ -20,6 +20,9 @@
#include <fcntl.h>
#include <stdarg.h>
#include <stddef.h>
+#include <stdio.h>
+
+extern char **__libc_argv attribute_hidden;
/* Open FILE with access OFLAG. If OFLAG includes O_CREAT,
a third argument is the file protection. */
@@ -51,4 +54,18 @@
stub_warning (open)
weak_alias (__open, open)
+
+
+int
+__open_2 (file, oflag)
+ const char *file;
+ int oflag;
+{
+ if (oflag & O_CREAT)
+ __fortify_fail ("invalid open call: O_CREAT without mode");
+
+ return __open (file, oflag);
+}
+stub_warning (__open_2)
+
#include <stub-tag.h>
Modified: fsf/trunk/libc/io/open64.c
==============================================================================
--- fsf/trunk/libc/io/open64.c (original)
+++ fsf/trunk/libc/io/open64.c Fri May 25 00:03:57 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1999, 2000, 2002
+/* Copyright (C) 1991, 1995, 1996, 1997, 1999, 2000, 2002, 2007
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -21,7 +21,7 @@
#include <fcntl.h>
#include <stdarg.h>
#include <stddef.h>
-#include <bp-sym.h>
+#include <stdio.h>
/* Open FILE with access OFLAG. If OFLAG includes O_CREAT,
a third argument is the file protection. */
@@ -51,7 +51,21 @@
}
strong_alias (__libc_open64, __open64)
libc_hidden_def (__open64)
-weak_alias (__libc_open64, BP_SYM (open64))
+weak_alias (__libc_open64, open64)
stub_warning (open64)
+
+
+int
+__open64_2 (file, oflag)
+ const char *file;
+ int oflag;
+{
+ if (oflag & O_CREAT)
+ __fortify_fail ("invalid open64 call: O_CREAT without mode");
+
+ return __open64 (file, oflag);
+}
+stub_warning (__open64_2)
+
#include <stub-tag.h>
Modified: fsf/trunk/libc/io/openat.c
==============================================================================
--- fsf/trunk/libc/io/openat.c (original)
+++ fsf/trunk/libc/io/openat.c Fri May 25 00:03:57 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -20,6 +20,7 @@
#include <fcntl.h>
#include <stdarg.h>
#include <stddef.h>
+#include <stdio.h>
#include <sys/stat.h>
/* Open FILE with access OFLAG. Interpret relative paths relative to
@@ -68,4 +69,18 @@
weak_alias (__openat, openat)
stub_warning (openat)
+
+int
+__openat_2 (fd, file, oflag)
+ int fd;
+ const char *file;
+ int oflag;
+{
+ if (oflag & O_CREAT)
+ __fortify_fail ("invalid openat call: O_CREAT without mode");
+
+ return __openat (file, oflag);
+}
+stub_warning (__openat_2)
+
#include <stub-tag.h>
Modified: fsf/trunk/libc/io/openat64.c
==============================================================================
--- fsf/trunk/libc/io/openat64.c (original)
+++ fsf/trunk/libc/io/openat64.c Fri May 25 00:03:57 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -20,6 +20,7 @@
#include <fcntl.h>
#include <stdarg.h>
#include <stddef.h>
+#include <stdio.h>
#include <sys/stat.h>
/* Open FILE with access OFLAG. Interpret relative paths relative to
@@ -68,4 +69,18 @@
weak_alias (__openat64, openat64)
stub_warning (openat64)
+
+int
+__openat64_2 (fd, file, oflag)
+ int fd;
+ const char *file;
+ int oflag;
+{
+ if (oflag & O_CREAT)
+ __fortify_fail ("invalid openat64 call: O_CREAT without mode");
+
+ return __openat64 (file, oflag);
+}
+stub_warning (__openat_2)
+
#include <stub-tag.h>
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Fri May 25 00:03:57 2007
@@ -1,3 +1,25 @@
+2007-04-24 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/i386/tls.h (THREAD_SET_PRIVATE_FUTEX,
+ THREAD_COPY_PRIVATE_FUTEX): Define.
+ * sysdeps/x86_64/tls.h (THREAD_SET_PRIVATE_FUTEX,
+ THREAD_COPY_PRIVATE_FUTEX): Define.
+ * allocatestack.c (allocate_stack): Use THREAD_COPY_PRIVATE_FUTEX.
+ * init.c (__pthread_initialize_minimal_internal): Use
+ THREAD_SET_PRIVATE_FUTEX.
+
+ * sysdeps/powerpc/tls.h (tcbhead_t): Add gscope_flag.
+ (THREAD_GSCOPE_FLAG_UNUSED, THREAD_GSCOPE_FLAG_USED,
+ THREAD_GSCOPE_FLAG_WAIT): Define.
+ (THREAD_GSCOPE_GET_FLAG, THREAD_GSCOPE_SET_FLAG,
+ THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_WAIT): Define.
+ * sysdeps/i386/tls.h (THREAD_GSCOPE_WAIT): Don't use
+ PTR_DEMANGLE.
+ (THREAD_GSCOPE_GET_FLAG): Define.
+ * sysdeps/x86_64/tls.h (THREAD_GSCOPE_GET_FLAG): Define.
+ * allocatestack.c (__wait_lookup_done): Use THREAD_GSCOPE_GET_FLAG
+ instead of ->header.gscope_flag directly.
+
2007-05-23 Ulrich Drepper <drepper@xxxxxxxxxx>
* init.c (__pthread_initialize_minimal_internal): Check whether
Modified: fsf/trunk/libc/nptl/allocatestack.c
==============================================================================
--- fsf/trunk/libc/nptl/allocatestack.c (original)
+++ fsf/trunk/libc/nptl/allocatestack.c Fri May 25 00:03:57 2007
@@ -376,10 +376,9 @@
__pthread_multiple_threads = *__libc_multiple_threads_ptr = 1;
#endif
-#ifndef __ASSUME_PRIVATE_FUTEX
+#ifdef THREAD_COPY_PRIVATE_FUTEX
/* The thread must know when private futexes are supported. */
- pd->header.private_futex = THREAD_GETMEM (THREAD_SELF,
- header.private_futex);
+ THREAD_COPY_PRIVATE_FUTEX (pd);
#endif
#ifdef NEED_DL_SYSINFO
@@ -516,10 +515,9 @@
__pthread_multiple_threads = *__libc_multiple_threads_ptr = 1;
#endif
-#ifndef __ASSUME_PRIVATE_FUTEX
+#ifdef THREAD_COPY_PRIVATE_FUTEX
/* The thread must know when private futexes are supported. */
- pd->header.private_futex = THREAD_GETMEM (THREAD_SELF,
- header.private_futex);
+ THREAD_COPY_PRIVATE_FUTEX (pd);
#endif
#ifdef NEED_DL_SYSINFO
@@ -1023,10 +1021,10 @@
list_for_each (runp, &stack_used)
{
struct pthread *t = list_entry (runp, struct pthread, list);
- if (t == self || t->header.gscope_flag == THREAD_GSCOPE_FLAG_UNUSED)
+ if (t == self || THREAD_GSCOPE_GET_FLAG (t) == THREAD_GSCOPE_FLAG_UNUSED)
continue;
- int *const gscope_flagp = &t->header.gscope_flag;
+ int *const gscope_flagp = &THREAD_GSCOPE_GET_FLAG (t);
/* We have to wait until this thread is done with the global
scope. First tell the thread that we are waiting and
@@ -1045,10 +1043,10 @@
list_for_each (runp, &__stack_user)
{
struct pthread *t = list_entry (runp, struct pthread, list);
- if (t == self || t->header.gscope_flag == THREAD_GSCOPE_FLAG_UNUSED)
+ if (t == self || THREAD_GSCOPE_GET_FLAG (t) == THREAD_GSCOPE_FLAG_UNUSED)
continue;
- int *const gscope_flagp = &t->header.gscope_flag;
+ int *const gscope_flagp = &THREAD_GSCOPE_GET_FLAG (t);
/* We have to wait until this thread is done with the global
scope. First tell the thread that we are waiting and
Modified: fsf/trunk/libc/nptl/init.c
==============================================================================
--- fsf/trunk/libc/nptl/init.c (original)
+++ fsf/trunk/libc/nptl/init.c Fri May 25 00:03:57 2007
@@ -276,7 +276,7 @@
#endif
set_robust_list_not_avail ();
-#ifndef __ASSUME_PRIVATE_FUTEX
+#ifdef THREAD_SET_PRIVATE_FUTEX
/* Private futexes are always used (at least internally) so that
doing the test once this early is beneficial. */
{
@@ -284,7 +284,7 @@
res = INTERNAL_SYSCALL (futex, err, 3, &word,
FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1);
if (!INTERNAL_SYSCALL_ERROR_P (res, err))
- THREAD_SETMEM (pd, header.private_futex, FUTEX_PRIVATE_FLAG);
+ THREAD_SET_PRIVATE_FUTEX (FUTEX_PRIVATE_FLAG);
}
#endif
Modified: fsf/trunk/libc/nptl/sysdeps/i386/tls.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/i386/tls.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/i386/tls.h Fri May 25 00:03:57 2007
@@ -454,15 +454,17 @@
while (0)
#define THREAD_GSCOPE_SET_FLAG() \
THREAD_SETMEM (THREAD_SELF, header.gscope_flag, THREAD_GSCOPE_FLAG_USED)
-#ifdef PTR_DEMANGLE
-# define THREAD_GSCOPE_WAIT() \
- do { void (*ptr) (void) = GL(dl_wait_lookup_done); \
- PTR_DEMANGLE (ptr); \
- ptr (); \
- } while (0)
-#else
-# define THREAD_GSCOPE_WAIT() \
+#define THREAD_GSCOPE_GET_FLAG(descr) (descr)->header.gscope_flag
+#define THREAD_GSCOPE_WAIT() \
GL(dl_wait_lookup_done) ()
+
+
+#ifndef __ASSUME_PRIVATE_FUTEX
+# define THREAD_SET_PRIVATE_FUTEX(value) \
+ THREAD_SETMEM (THREAD_SELF, header.private_futex, value)
+# define THREAD_COPY_PRIVATE_FUTEX(descr) \
+ ((descr)->header.private_futex \
+ = THREAD_GETMEM (THREAD_SELF, header.private_futex))
#endif
Modified: fsf/trunk/libc/nptl/sysdeps/powerpc/tls.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/powerpc/tls.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/powerpc/tls.h Fri May 25 00:03:57 2007
@@ -1,5 +1,5 @@
/* Definition for thread-local data handling. NPTL/PowerPC version.
- Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 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
@@ -63,10 +63,11 @@
# include <nptl/descr.h>
/* The stack_guard is accessed directly by GCC -fstack-protector code,
- so it is a part of public ABI. The dtv and pointer_guard fields
- are private. */
+ so it is a part of public ABI. The dtv, pointer_guard and gscope_flag
+ fields are private. */
typedef struct
{
+ int gscope_flag;
uintptr_t pointer_guard;
uintptr_t stack_guard;
dtv_t *dtv;
@@ -180,6 +181,27 @@
different value to mean unset l_tls_offset. */
# define NO_TLS_OFFSET -1
+/* Get and set the global scope generation counter in the TCB head. */
+#define THREAD_GSCOPE_FLAG_UNUSED 0
+#define THREAD_GSCOPE_FLAG_USED 1
+#define THREAD_GSCOPE_FLAG_WAIT 2
+#define THREAD_GSCOPE_GET_FLAG(descr) \
+ (((tcbhead_t *) ((char *) (descr) \
+ + TLS_PRE_TCB_SIZE))[-1].gscope_flag)
+#define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res \
+ = atomic_exchange_rel (&THREAD_GSCOPE_GET_FLAG (THREAD_SELF), \
+ THREAD_GSCOPE_FLAG_UNUSED); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_GSCOPE_GET_FLAG (THREAD_SELF), 1); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_SET_FLAG() \
+ (THREAD_GSCOPE_GET_FLAG (THREAD_SELF) = THREAD_GSCOPE_FLAG_USED)
+#define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
#endif /* __ASSEMBLER__ */
#endif /* tls.h */
Modified: fsf/trunk/libc/nptl/sysdeps/x86_64/tls.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/x86_64/tls.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/x86_64/tls.h Fri May 25 00:03:57 2007
@@ -360,9 +360,17 @@
while (0)
#define THREAD_GSCOPE_SET_FLAG() \
THREAD_SETMEM (THREAD_SELF, header.gscope_flag, THREAD_GSCOPE_FLAG_USED)
+#define THREAD_GSCOPE_GET_FLAG(descr) (descr)->header.gscope_flag
#define THREAD_GSCOPE_WAIT() \
GL(dl_wait_lookup_done) ()
+#ifndef __ASSUME_PRIVATE_FUTEX
+# define THREAD_SET_PRIVATE_FUTEX(value) \
+ THREAD_SETMEM (THREAD_SELF, header.private_futex, value)
+# define THREAD_COPY_PRIVATE_FUTEX(descr) \
+ ((descr)->header.private_futex \
+ = THREAD_GETMEM (THREAD_SELF, header.private_futex))
+#endif
#endif /* __ASSEMBLER__ */
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/Makefile
==============================================================================
Binary files - no diff available.
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/open64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/open64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/open64.c Fri May 25 00:03:57 2007
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1995-1997,1999,2000,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995-1997,1999,2000,2002,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
@@ -19,7 +20,7 @@
#include <errno.h>
#include <fcntl.h>
#include <stdarg.h>
-#include <bp-sym.h>
+#include <stdio.h>
#include <sysdep-cancel.h>
/* Open FILE with access OFLAG. If OFLAG includes O_CREAT,
@@ -48,6 +49,29 @@
return result;
}
-weak_alias (__libc_open64, BP_SYM (__open64))
-libc_hidden_weak (BP_SYM (__open64))
-weak_alias (__libc_open64, BP_SYM (open64))
+weak_alias (__libc_open64, __open64)
+libc_hidden_weak (__open64)
+weak_alias (__libc_open64, open64)
+
+
+#ifndef PTW
+int
+__open64_2 (file, oflag)
+ const char *file;
+ int oflag;
+{
+ if (oflag & O_CREAT)
+ __fortify_fail ("invalid open64 call: O_CREAT without mode");
+
+ if (SINGLE_THREAD_P)
+ return INLINE_SYSCALL (open, 2, file, oflag | O_LARGEFILE);
+
+ int oldtype = LIBC_CANCEL_ASYNC ();
+
+ int result = INLINE_SYSCALL (open, 2, file, oflag | O_LARGEFILE);
+
+ LIBC_CANCEL_RESET (oldtype);
+
+ return result;
+}
+#endif
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/open_2.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/open_2.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/open_2.c Fri May 25 00:03:57 2007
@@ -1,0 +1,32 @@
+/* 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 <fcntl.h>
+#include <stdio.h>
+
+
+int
+__open_2 (file, oflag)
+ const char *file;
+ int oflag;
+{
+ if (oflag & O_CREAT)
+ __fortify_fail ("invalid open call: O_CREAT without mode");
+
+ return __open (file, oflag);
+}
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/openat.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/openat.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/openat.c Fri May 25 00:03:57 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -30,6 +30,7 @@
#ifndef OPENAT
# define OPENAT openat
+# define __OPENAT_2 __openat_2
# ifndef __ASSUME_ATFCTS
/* Set errno after a failed call. If BUF is not null,
@@ -173,3 +174,18 @@
}
libc_hidden_def (__OPENAT)
weak_alias (__OPENAT, OPENAT)
+
+
+int
+__OPENAT_2 (fd, file, oflag)
+ int fd;
+ const char *file;
+ int oflag;
+{
+ if (oflag & O_CREAT)
+#define MSG(s) MSG2 (s)
+#define MSG2(s) "invalid " #s " call: O_CREAT without mode"
+ __fortify_fail (MSG (OPENAT));
+
+ return __OPENAT (fd, file, oflag);
+}
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/openat64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/openat64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/openat64.c Fri May 25 00:03:57 2007
@@ -1,4 +1,5 @@
#define OPENAT openat64
+#define __OPENAT_2 __openat64_2
#define MORE_OFLAGS O_LARGEFILE
#include "openat.c"