39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From: Jason Wang <jasowang@redhat.com>
|
||
|
|
Date: Wed, 24 Feb 2021 13:14:35 +0800
|
||
|
|
Subject: sungem: 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: 8c92060d3c0248bd4d515719a35922cd2391b9b4
|
||
|
|
|
||
|
|
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: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
|
||
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
hw/net/sungem.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/net/sungem.c b/hw/net/sungem.c
|
||
|
|
index 33c3722df6f7c052b1632115e602..3684a4d733b6ec8bea39b4487e18 100644
|
||
|
|
--- a/hw/net/sungem.c
|
||
|
|
+++ b/hw/net/sungem.c
|
||
|
|
@@ -306,7 +306,7 @@ static void sungem_send_packet(SunGEMState *s, const uint8_t *buf,
|
||
|
|
NetClientState *nc = qemu_get_queue(s->nic);
|
||
|
|
|
||
|
|
if (s->macregs[MAC_XIFCFG >> 2] & MAC_XIFCFG_LBCK) {
|
||
|
|
- nc->info->receive(nc, buf, size);
|
||
|
|
+ qemu_receive_packet(nc, buf, size);
|
||
|
|
} else {
|
||
|
|
qemu_send_packet(nc, buf, size);
|
||
|
|
}
|