diff options
author | Ulrich Drepper <drepper@redhat.com> | 2005-02-21 23:14:10 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2005-02-21 23:14:10 +0000 |
commit | 553cc5f9ad5408fc7fb49a33417acc1446f0c548 (patch) | |
tree | d4feec607359c614b579876e8035ce539dfac3b8 /debug/read_chk.c | |
parent | 53360aa17295db38e5d5e0ed16548f5f002f0fa2 (diff) | |
download | glibc-553cc5f9ad5408fc7fb49a33417acc1446f0c548.zip glibc-553cc5f9ad5408fc7fb49a33417acc1446f0c548.tar.gz glibc-553cc5f9ad5408fc7fb49a33417acc1446f0c548.tar.bz2 |
* 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 <bits/unistd.h> for fortification.
* posix/bits/unistd.h: New file.
* posix/Makefile (headers): Add bits/unistd.h.
* socket/sys/socket.h: Include <bits/socket2.h> 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 <jakub@redhat.com>
* malloc/malloc.c (malloc_printerr): If MALLOC_CHECK_={5,7}, print
the error message rather than program name.
2005-02-21 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'debug/read_chk.c')
-rw-r--r-- | debug/read_chk.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/debug/read_chk.c b/debug/read_chk.c new file mode 100644 index 0000000..88404ed --- /dev/null +++ b/debug/read_chk.c @@ -0,0 +1,41 @@ +/* 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. */ + +#include <unistd.h> +#include <sys/param.h> +#ifdef HAVE_INLINED_SYSCALLS +# include <errno.h> +# include <sysdep.h> +#endif + + +ssize_t +__read_chk (int fd, void *buf, size_t nbytes, size_t buflen) +{ + /* In case NBYTES is greater than BUFLEN, we read BUFLEN+1 bytes. + This might overflow the buffer but the damage is reduced to just + one byte. And the program will terminate right away. */ +#ifdef HAVE_INLINED_SYSCALLS + ssize_t n = INLINE_SYSCALL (read, 3, fd, buf, MIN (nbytes, buflen + 1)); +#else + ssize_t n = __read (fd, buf, MIN (nbytes, buflen + 1)); +#endif + if (n > 0 && (size_t) n > buflen) + __chk_fail (); + return n; +} |