From ddfd0535776c47ec01231ac91fabe8b2e128cfa3 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 24 May 2007 23:55:28 +0000 Subject: * 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. --- io/bits/fcntl2.h | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 io/bits/fcntl2.h (limited to 'io/bits') diff --git a/io/bits/fcntl2.h b/io/bits/fcntl2.h new file mode 100644 index 0000000..5f400ae --- /dev/null +++ b/io/bits/fcntl2.h @@ -0,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 directly; use 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 -- cgit v1.1