From 8b8b797292218050ff191ccb90da498862afd0f2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 1 Mar 2005 00:42:41 +0000 Subject: (__getcwd_chk): Always fail if the buffer is too small. --- debug/pread64_chk.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'debug/pread64_chk.c') diff --git a/debug/pread64_chk.c b/debug/pread64_chk.c index 5402e05..daea1d7 100644 --- a/debug/pread64_chk.c +++ b/debug/pread64_chk.c @@ -23,11 +23,8 @@ ssize_t __pread64_chk (int fd, void *buf, size_t nbytes, off64_t offset, 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. */ - ssize_t n = __pread64 (fd, buf, offset, MIN (nbytes, buflen + 1)); - if (n > 0 && (size_t) n > buflen) + if (nbytes > buflen) __chk_fail (); - return n; + + return __pread64 (fd, buf, offset, MIN (nbytes, buflen + 1)); } -- cgit v1.1