From 553cc5f9ad5408fc7fb49a33417acc1446f0c548 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 21 Feb 2005 23:14:10 +0000 Subject: * sysdeps/unix/sysv/linux/libc_fatal.c: Print backtrace and memory map if requested. * debug/chk_fail.c: Request backtrace and memory map dump. * Versions.def: Add GLIBC_2.4 for libc. * debug/fgets_chk.c: New file. * debug/fgets_u_chk.c: New file. * debug/getcwd_chk.c: New file. * debug/getwd_chk.c: New file. * debug/readlink_chk.c: New file. * debug/read_chk.c: New file. * debug/pread_chk.c: New file. * debug/pread64_chk.c: New file. * debug/recv_chk.c: New file. * debug/recvfrom_chk.c: New file. * debug/Versions: Add all new functions with version GLIBC_2.4. * debug/Makefile (routines): Add fgets_chk, fgets_u_chk, read_chk, pread_chk, pread64_chk, recv_chk, recvfrom_chk, readlink_chk, getwd_chk, and getcwd_chk. Plus appropriate CFLAGS definitions. * debug/tst-chk1.c: Add more tests. * libio/bits/stdio2.h: Add macros for fgets and fgets_unlocked. * include/stdio.h: Declare __fgets_chk and __fgets_unlocked_chk. * posix/unistd.h: Include for fortification. * posix/bits/unistd.h: New file. * posix/Makefile (headers): Add bits/unistd.h. * socket/sys/socket.h: Include for fortification. * socket/bits/socket2.h: New file. * socket/Makefile (headers): Add bits/socket2.h. * string/bits/string3.h: Extend memset macro to check for zero 3rd parameter and use __memset_zero_constant_len_parameter in that case. * sysdeps/generic/memset_chk.c: Add __memset_zero_constant_len_parameter alias and linker warning. * debug/Versions: Add __memset_zero_constant_len_parameter to libc with version GLIBC_2.4. * sysdeps/generic/bits/types.h: Don't unnecessarily use __extension__ in __STD_TYPE definition. 2005-02-21 Jakub Jelinek * malloc/malloc.c (malloc_printerr): If MALLOC_CHECK_={5,7}, print the error message rather than program name. 2005-02-21 Ulrich Drepper --- posix/Makefile | 2 +- posix/bits/unistd.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++ posix/unistd.h | 1 + 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 posix/bits/unistd.h (limited to 'posix') diff --git a/posix/Makefile b/posix/Makefile index 929ea47790..f79d079320 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -28,7 +28,7 @@ headers := sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h \ bits/local_lim.h tar.h bits/utsname.h bits/confname.h \ bits/waitflags.h bits/waitstatus.h sys/unistd.h sched.h \ bits/sched.h re_comp.h wait.h bits/environments.h cpio.h \ - sys/sysmacros.h spawn.h + sys/sysmacros.h spawn.h bits/unistd.h distribute := confstr.h TESTS TESTS2C.sed testcases.h \ PTESTS PTESTS2C.sed ptestcases.h \ diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h new file mode 100644 index 0000000000..3b9c67cb31 --- /dev/null +++ b/posix/bits/unistd.h @@ -0,0 +1,78 @@ +/* Checking macros for unistd functions. + Copyright (C) 2005 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 _UNISTD_H +# error "Never include directly; use instead." +#endif + +extern ssize_t __read_chk (int __fd, void *__buf, size_t __nbytes, + size_t __buflen) __wur; +#define read(fd, buf, nbytes) \ + (__bos (buf) != (size_t) -1 \ + ? __read_chk (fd, buf, nbytes, __bos (buf)) \ + : read (fd, buf, nbytes)) + +#ifdef __USE_UNIX98 +extern ssize_t __pread_chk (int __fd, void *__buf, size_t __nbytes, + __off_t __offset, size_t __bufsize) __wur; +extern ssize_t __pread64_chk (int __fd, void *__buf, size_t __nbytes, + __off64_t __offset, size_t __bufsize) __wur; +# ifndef __USE_FILE_OFFSET64 +# define pread(fd, buf, nbytes, offset) \ + (__bos (buf) != (size_t) -1 \ + ? __pread64_chk (fd, buf, nbytes, offset, __bos (buf)) \ + : pread (fd, buf, offset, nbytes)) +# else +# define pread(fd, buf, nbytes, offset) \ + (__bos (buf) != (size_t) -1 \ + ? __pread_chk (fd, buf, nbytes, offset, __bos (buf)) \ + : pread (fd, buf, offset, nbytes)) +# endif + +# ifdef __USE_LARGEFILE64 +# define pread64(fd, buf, nbytes, offset) \ + (__bos (buf) != (size_t) -1 \ + ? __pread64_chk (fd, buf, nbytes, offset, __bos (buf)) \ + : pread64 (fd, buf, offset, nbytes)) +# endif +#endif + +#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K +extern int __readlink_chk (__const char *__restrict __path, + char *__restrict __buf, size_t __len, + size_t __buflen) + __THROW __nonnull ((1, 2)) __wur; +# define readlink(path, buf, len) \ + (__bos (buf) != (size_t) -1 \ + ? __readlink_chk (path, buf, len, __bos (buf)) \ + : readlink (path, buf, len)) +#endif + +extern char *__getcwd_chk (char *__buf, size_t __size, size_t __buflen) + __THROW __wur; +#define getcwd(buf, size) \ + (__bos (buf) != (size_t) -1 \ + ? __getcwd_chk (buf, size, buflen) : getcwd (buf, size)) + +#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +extern char *__getwd_chk (char *__buf, size_t buflen) + __THROW __nonnull ((1)) __attribute_deprecated__ __wur; +#define getwd(buf) \ + (__bos (buf) != (size_t) -1 ? __getwd_chk (buf, buflen) : getwd (buf)) +#endif diff --git a/posix/unistd.h b/posix/unistd.h index 97e28fc70b..d6cd152b46 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -1046,6 +1046,7 @@ extern void swab (__const void *__restrict __from, void *__restrict __to, extern char *ctermid (char *__s) __THROW __nonnull ((1)); #endif + /* Define some macros helping to catch buffer overflows. */ #if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus # include -- cgit v1.2.3