File 0196-e1000-switch-to-use-qemu_receive_pa.patch of Package qemu-testsuite

Overview Repositories Revisions Requests Users Attributes Meta

File 0196-e1000-switch-to-use-qemu_receive_pa.patch of Package qemu-testsuite (Revision 0f51cfd1901be114af9a69d703c0611c)

Currently displaying revision 0f51cfd1901be114af9a69d703c0611c , Show latest

From: Jason Wang <jasowang@redhat.com>
Date: Wed, 24 Feb 2021 12:13:22 +0800
Subject: e1000: switch to use qemu_receive_packet() for loopback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Git-commit: 1caff0340f49c93d535c6558a5138d20d475315c

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: Jason Wang <jasowang@redhat.com>
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 hw/net/e1000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 85335d87a08fdaae89427c32fb1d..892fda9491a0de283fd69dd6704a 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -533,7 +533,7 @@ e1000_send_packet(E1000State *s, const uint8_t *buf, int size)
 
     NetClientState *nc = qemu_get_queue(s->nic);
     if (s->phy_reg[PHY_CTRL] & MII_CR_LOOPBACK) {
-        nc->info->receive(nc, buf, size);
+        qemu_receive_packet(nc, buf, size);
     } else {
         qemu_send_packet(nc, buf, size);
     }

Places

File 0196-e1000-switch-to-use-qemu_receive_pa.patch of Package qemu-testsuite (Revision 0f51cfd1901be114af9a69d703c0611c)

Places