aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bulekov <alxndr@bu.edu>2021-03-01 14:35:30 -0500
committerJason Wang <jasowang@redhat.com>2021-03-15 16:41:22 +0800
commit37cee01784ff0df13e5209517e1b3594a5e792d1 (patch)
tree9363c9838b916031178e5b0b336ddadf557798ed
parente73adfbeec9d4e008630c814759052ed945c3fed (diff)
downloadqemu-37cee01784ff0df13e5209517e1b3594a5e792d1.zip
qemu-37cee01784ff0df13e5209517e1b3594a5e792d1.tar.gz
qemu-37cee01784ff0df13e5209517e1b3594a5e792d1.tar.bz2
lan9118: 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 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/lan9118.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index abc7962..6aff424 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -680,7 +680,7 @@ static void do_tx_packet(lan9118_state *s)
/* FIXME: Honor TX disable, and allow queueing of packets. */
if (s->phy_control & 0x4000) {
/* This assumes the receive routine doesn't touch the VLANClient. */
- lan9118_receive(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
+ qemu_receive_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
} else {
qemu_send_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
}