aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bulekov <alxndr@bu.edu>2021-03-01 10:33:34 -0500
committerJason Wang <jasowang@redhat.com>2021-03-15 16:41:22 +0800
commit99ccfaa1edafd79f7a3a0ff7b58ae4da7c514928 (patch)
tree93939af720b33ba30e0e15fc89ae6f454dfbd58b
parent5311fb805a4403bba024e83886fa0e7572265de4 (diff)
downloadqemu-99ccfaa1edafd79f7a3a0ff7b58ae4da7c514928.zip
qemu-99ccfaa1edafd79f7a3a0ff7b58ae4da7c514928.tar.gz
qemu-99ccfaa1edafd79f7a3a0ff7b58ae4da7c514928.tar.bz2
pcnet: switch to use qemu_receive_packet() for loopback
This patch switches to use qemu_receive_packet() which can detect reentrancy and return early. This is intended to address CVE-2021-3416. Cc: Prasad J Pandit <ppandit@redhat.com> Cc: qemu-stable@nongnu.org Buglink: https://bugs.launchpad.net/qemu/+bug/1917085 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com Signed-off-by: Alexander Bulekov <alxndr@bu.edu> Signed-off-by: Jason Wang <jasowang@redhat.com>
-rw-r--r--hw/net/pcnet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index f3f18d8..dcd3fc4 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -1250,7 +1250,7 @@ txagain:
if (BCR_SWSTYLE(s) == 1)
add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS);
s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC;
- pcnet_receive(qemu_get_queue(s->nic), s->buffer, s->xmit_pos);
+ qemu_receive_packet(qemu_get_queue(s->nic), s->buffer, s->xmit_pos);
s->looptest = 0;
} else {
if (s->nic) {