Skip to content

Commit

Permalink
(__getcwd_chk): Always fail if the buffer is too small.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ulrich Drepper committed Mar 1, 2005
1 parent 61062f5 commit 8b8b797
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 17 deletions.
6 changes: 3 additions & 3 deletions debug/getcwd_chk.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
char *
__getcwd_chk (char *buf, size_t size, size_t buflen)
{
char *res = __getcwd (buf, MIN (size, buflen));
if (res == NULL && errno == ERANGE && size > buflen)
if (size > buflen)
__chk_fail ();
return res;

return __getcwd (buf, size);
}
9 changes: 3 additions & 6 deletions debug/pread64_chk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
13 changes: 5 additions & 8 deletions debug/readlink_chk.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@
ssize_t
__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
{
/* In case LEN 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 (len > buflen)
__chk_fail ();

#ifdef HAVE_INLINED_SYSCALLS
int n = INLINE_SYSCALL (readlink, 3, path, buf, MIN (len, buflen + 1));
return INLINE_SYSCALL (readlink, 3, path, buf, MIN (len, buflen + 1));
#else
int n = __readlink (path, buf, MIN (len, buflen + 1));
return __readlink (path, buf, MIN (len, buflen + 1));
#endif
if (n > 0 && (size_t) n > buflen)
__chk_fail ();
return n;
}

0 comments on commit 8b8b797

Please sign in to comment.