OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* debug/recv_chk.c (__recv_chk): Always fail if request could

Browse Source 
overflow the buffer.
	* debug/recvfrom_chk.c (__recvfrom_chk): Likewise.
This commit is contained in:
Ulrich Drepper 2005-03-06 21:25:22 +00:00
parent 5dc2883e54
commit 84c33ccbbe
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2005-03-06 Ulrich Drepper <drepper@redhat.com>
* debug/recv_chk.c (__recv_chk): Always fail if request could
overflow the buffer.
* debug/recvfrom_chk.c (__recvfrom_chk): Likewise.
* socket/bits/socket2.h (recv): Avoid calls to the _chk variant if
we know the call succeeds.
(recvfrom): Likewise.

9
debug/recv_chk.c
View File

@ -23,11 +23,8 @@
ssize_t
__recv_chk (int fd, void *buf, size_t n, size_t buflen, int flags)
{
/* In case N 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 nrecv = __recv (fd, buf, MIN (n, buflen + 1), flags);
if (nrecv > 0 && (size_t) nrecv > buflen)
if (n > buflen)
__chk_fail ();
return nrecv;
return __recv (fd, buf, n, flags);
}

10
debug/recvfrom_chk.c
View File

@ -24,12 +24,8 @@ ssize_t
__recvfrom_chk (int fd, void *buf, size_t n, size_t buflen, int flags,
__SOCKADDR_ARG addr, socklen_t *addr_len)
{
/* In case N 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 nrecv = __recvfrom (fd, buf, MIN (n, buflen + 1), flags,
addr, addr_len);
if (nrecv > 0 && (size_t) nrecv > buflen)
if (n > buflen)
__chk_fail ();
return nrecv;
return __recvfrom (fd, buf, n, flags, addr, addr_len);
}