jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-21 08:20:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rx: Handle negative returns on packet reads

Browse Source 
rxi_RecvMsg returns an int, because it can return a negative value upon
error. Don't store its return value as an unsigned int, because this may
hide the potential errors.

Modify the error handling loop so that errors get to where they are
intended.

Change-Id: I212e5881f83a2a95c177c23dbc2da2583155f1aa
Reviewed-on: http://gerrit.openafs.org/7087
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Simon Wilkinson 2012-03-30 19:37:36 +01:00 committed by Derrick Brashear
parent 4e68282e26
commit 438d6ba63c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rx/rx_packet.c
View File

@ -1407,7 +1407,7 @@ rxi_ReadPacket(osi_socket socket, struct rx_packet *p, afs_uint32 * host,
u_short * port) u_short * port)
{ {
struct sockaddr_in from; struct sockaddr_in from;
unsigned int nbytes; int nbytes;
afs_int32 rlen; afs_int32 rlen;
afs_uint32 tlen, savelen; afs_uint32 tlen, savelen;
struct msghdr msg; struct msghdr msg;
@ -1446,7 +1446,7 @@ rxi_ReadPacket(osi_socket socket, struct rx_packet *p, afs_uint32 * host,
p->wirevec[p->niovecs - 1].iov_len = savelen; p->wirevec[p->niovecs - 1].iov_len = savelen;
p->length = (u_short)(nbytes - RX_HEADER_SIZE); p->length = (u_short)(nbytes - RX_HEADER_SIZE);
if ((nbytes > tlen) || (p->length & 0x8000)) { /* Bogus packet */ if (nbytes < 0 || (nbytes > tlen) || (p->length & 0x8000)) { /* Bogus packet */
if (nbytes < 0 && errno == EWOULDBLOCK) { if (nbytes < 0 && errno == EWOULDBLOCK) {
if (rx_stats_active) if (rx_stats_active)
rx_atomic_inc(&rx_stats.noPacketOnRead); rx_atomic_inc(&rx_stats.noPacketOnRead);