net: pcnet: add check to validate receive data size(CVE-2015-7504)
PATCH 1/2 net: pcnet: add check to validate receive data size(CVE-2015-7504)
From: Prasad J Pandit <[email protected]>
In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that.
Reported by: Qinghao Tang <[email protected]>
--- hw/net/pcnet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
hw/net/pcnet.c +5 -3
@@ -1084,7 +1084,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)uint32_t fcs = ~0 ;uint8_t *p = src; -while (p != &src[size-4 ]) +while (p != &src[size])CRC (fcs, *p++); crc_err = (*(uint32_t *)p !=htonl (fcs)); }
@@ -1233,8 +1233,10 @@ static void pcnet_transmit(PCNetState *s) bcnt =4096 -GET_FIELD (tmd.length,TMDL ,BCNT );/* if multi-tmd packet outsizes s->buffer then skip it silently. -Note: this is not what real hw does */ -if (s->xmit_pos + bcnt >sizeof (s->buffer)) { +* Note: this is not what real hw does. +* Last four bytes of s->buffer are used to store CRC FCS code. +*/ +if (s->xmit_pos + bcnt >sizeof (s->buffer) -4 ) { s->xmit_pos =-1 ; goto txdone; }
Signature · 1 line
2.5.0
PATCH 2/2 pcnet: fix rx buffer overflow(CVE-2015-7512)
Backends could provide a packet whose length is greater than buffer size. Check for this and truncate the packet to avoid rx buffer overflow in this case.
--- hw/net/pcnet.c | 6 ++++++ 1 file changed, 6 insertions(+)
hw/net/pcnet.c +6 -0
@@ -1064,6 +1064,12 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)int pktcount =0 ;if (!s->looptest) { +if (size >4092 ) { +#ifdef PCNET_DEBUG_RMD +fprintf (stderr,"pcnet: truncates rx packet.\n" ); +#endif + size =4092 ; + }memcpy (src, buf, size);/* no need to compute the CRC */ src[size] =0 ;
Signature · 1 line
2.5.0
Re: [Qemu-devel] [PATCH for 2.5 2/2] pcnet: fix rx buffer overflow(CVE-2015-7512)
Quoted 7 lines · Jason Wang
Backends could provide a packet whose length is greater than buffer size. Check for this and truncate the packet to avoid rx buffer overflow in this case.
Cc Prasad J Pandit <[email protected]>Signed-off-by Jason Wang <[email protected]>
Quoted 24 lines
--- hw/net/pcnet.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/net/pcnet.c +6
-0@@ -1064,6 +1064,12 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)int pktcount =0 ;if (!s->looptest) { +if (size >4092 ) { +#ifdef PCNET_DEBUG_RMD +fprintf (stderr,"pcnet: truncates rx packet.\n" ); +#endif + size =4092 ; + }memcpy (src, buf, size);/* no need to compute the CRC */ src[size] =0 ;Signature · 1 line
2.5.0
Jason Wang
AppliedRe: [Qemu-devel] [PATCH for 2.5 2/2] pcnet: fix rx buffer overflow(CVE-2015-7512)
Quoted 9 lines · Michael S. Tsirkin
Quoted 7 lines · Jason Wang
Backends could provide a packet whose length is greater than buffer size. Check for this and truncate the packet to avoid rx buffer overflow in this case.
Cc Prasad J Pandit <[email protected]>Signed-off-by Jason Wang <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>
Applied to my -net. Thanks.
Quoted 25 lines
Quoted 25 lines
--- hw/net/pcnet.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/net/pcnet.c +6
-0@@ -1064,6 +1064,12 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)int pktcount =0 ;if (!s->looptest) { +if (size >4092 ) { +#ifdef PCNET_DEBUG_RMD +fprintf (stderr,"pcnet: truncates rx packet.\n" ); +#endif + size =4092 ; + }memcpy (src, buf, size);/* no need to compute the CRC */ src[size] =0 ;Signature · 1 line
2.5.0
Quoted 11 lines · Jason Wang
From: Prasad J Pandit <[email protected]>
In loopback mode,
pcnet_receiveroutine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes afters->buffer. Added a check to avoid that.Reported by: Qinghao Tang <[email protected]>
Signed-off-by Prasad J Pandit <[email protected]>Signed-off-by Jason Wang <[email protected]>
Quoted 33 lines
--- hw/net/pcnet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)hw/net/pcnet.c +5
-3@@ -1084,7 +1084,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)uint32_t fcs = ~0 ;uint8_t *p = src; -while (p != &src[size-4 ]) +while (p != &src[size])CRC (fcs, *p++); crc_err = (*(uint32_t *)p !=htonl (fcs)); }@@ -1233,8 +1233,10 @@ static void pcnet_transmit(PCNetState *s) bcnt =4096 -GET_FIELD (tmd.length,TMDL ,BCNT );/* if multi-tmd packet outsizes s->buffer then skip it silently. -Note: this is not what real hw does */ -if (s->xmit_pos + bcnt >sizeof (s->buffer)) { +* Note: this is not what real hw does. +* Last four bytes of s->buffer are used to store CRC FCS code. +*/ +if (s->xmit_pos + bcnt >sizeof (s->buffer) -4 ) { s->xmit_pos =-1 ; goto txdone; }Signature · 1 line
2.5.0
Jason Wang
AppliedQuoted 8 lines · Michael S. Tsirkin
Quoted 7 lines · Jason Wang
From: Prasad J Pandit <[email protected]>
In loopback mode,
pcnet_receiveroutine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes afters->buffer. Added a check to avoid that.
Quoted 5 lines
Quoted 4 lines
Reported by: Qinghao Tang <[email protected]>
Signed-off-by Prasad J Pandit <[email protected]>Signed-off-by Jason Wang <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>
Applied to my -net. Thanks
Quoted 33 lines
Quoted 33 lines
--- hw/net/pcnet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)hw/net/pcnet.c +5
-3@@ -1084,7 +1084,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)uint32_t fcs = ~0 ;uint8_t *p = src; -while (p != &src[size-4 ]) +while (p != &src[size])CRC (fcs, *p++); crc_err = (*(uint32_t *)p !=htonl (fcs)); }@@ -1233,8 +1233,10 @@ static void pcnet_transmit(PCNetState *s) bcnt =4096 -GET_FIELD (tmd.length,TMDL ,BCNT );/* if multi-tmd packet outsizes s->buffer then skip it silently. -Note: this is not what real hw does */ -if (s->xmit_pos + bcnt >sizeof (s->buffer)) { +* Note: this is not what real hw does. +* Last four bytes of s->buffer are used to store CRC FCS code. +*/ +if (s->xmit_pos + bcnt >sizeof (s->buffer) -4 ) { s->xmit_pos =-1 ; goto txdone; }Signature · 1 line
2.5.0