diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-03-01 00:35:23 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-03-01 00:35:23 +0000 |
| commit | 61062f56304750c367c5c1533351621353c112a7 (patch) | |
| tree | 30cff0c1f42e6eb794c5b7e41145e6cc93802d91 /debug/read_chk.c | |
| parent | cffa6970f9785ffcb2a60249b1aca6a2cfde4af3 (diff) | |
* posix/bits/unistd.h: Avoid calling __*_chk variants if we can
determine the call will never trigger a failure.
* sysdeps/i386/i686/memset_chk.S: Remove alias and warning.
* sysdeps/x86_64/memset_chk.S: Likewise.
2005-02-24 Roland McGrath <roland@redhat.com>
* debug/Versions (libc: GLIBC_2.4): Remove
__memset_zero_constant_len_parameter.
* sysdeps/generic/memset_chk.c: Remove alias and warning.
* misc/sys/cdefs.h (__warndecl): New macro.
* debug/warning-nop.c: New file.
* string/bits/string3.h (memset): Call __warn_memset_zero_len with no
arguments, instead of calling __memset_zero_constant_len_parameter.
Use __warndecl for __warn_memset_zero_len.
* debug/Makefile (routines): Add $(static-only-routines).
(static-only-routines): New variable.
Diffstat (limited to 'debug/read_chk.c')
| -rw-r--r-- | debug/read_chk.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/debug/read_chk.c b/debug/read_chk.c index 88404ed205..f738c48d6b 100644 --- a/debug/read_chk.c +++ b/debug/read_chk.c @@ -27,15 +27,12 @@ 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. */ + if (nbytes > buflen) + __chk_fail (); + #ifdef HAVE_INLINED_SYSCALLS - ssize_t n = INLINE_SYSCALL (read, 3, fd, buf, MIN (nbytes, buflen + 1)); + return = INLINE_SYSCALL (read, 3, fd, buf, nbytes); #else - ssize_t n = __read (fd, buf, MIN (nbytes, buflen + 1)); + return = __read (fd, buf, nbytes); #endif - if (n > 0 && (size_t) n > buflen) - __chk_fail (); - return n; } |