Subject: [PATCH 10/10] lan9118: switch to use qemu_receive_packet() for loopback

From: Alexander Bulekov <[email-masked]>
Date: Mon, 1 Mar 2021 14:35:30 -0500

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 <[email-masked]>
Cc: [email-masked]
Reviewed-by: Philippe Mathieu-Daudé <[email-masked]
Signed-off-by: Alexander Bulekov <[email-masked]>
Signed-off-by: Jason Wang <[email-masked]>

Upstream-Status: Backport [37cee01784ff0df13e5209517e1b3594a5e792d1]
CVE: CVE-2021-3416

Signed-off-by: Sakib Sajal <[email-masked]>
---
 hw/net/lan9118.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: qemu-4.2.0/hw/net/lan9118.c
===================================================================
--- qemu-4.2.0.orig/hw/net/lan9118.c
+++ qemu-4.2.0/hw/net/lan9118.c
@@ -667,7 +667,7 @@ static void do_tx_packet(lan9118_state *
     /* 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);
     }