40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
From: Alexander Bulekov <alxndr@bu.edu>
|
||
|
|
Date: Fri, 26 Feb 2021 13:47:53 -0500
|
||
|
|
Subject: rtl8139: 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: 5311fb805a4403bba024e83886fa0e7572265de4
|
||
|
|
References: bsc#1182968, CVE-2021-3416
|
||
|
|
|
||
|
|
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/1910826
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com
|
||
|
|
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
||
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
hw/net/rtl8139.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
|
||
|
|
index ba5ace1ab75cc91330f8f60b25c0..d2dd03e6a5866f4f549af2e97399 100644
|
||
|
|
--- a/hw/net/rtl8139.c
|
||
|
|
+++ b/hw/net/rtl8139.c
|
||
|
|
@@ -1795,7 +1795,7 @@ static void rtl8139_transfer_frame(RTL8139State *s, uint8_t *buf, int size,
|
||
|
|
}
|
||
|
|
|
||
|
|
DPRINTF("+++ transmit loopback mode\n");
|
||
|
|
- rtl8139_do_receive(qemu_get_queue(s->nic), buf, size, do_interrupt);
|
||
|
|
+ qemu_receive_packet(qemu_get_queue(s->nic), buf, size);
|
||
|
|
|
||
|
|
if (iov) {
|
||
|
|
g_free(buf2);
|