55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From e0b83063b76725878c466f1b8918c61864cfd0c2 Mon Sep 17 00:00:00 2001
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
|
Date: Tue, 29 Jun 2021 03:42:44 -0400
|
|
Subject: [PATCH 6/9] rtl8139: switch to use qemu_receive_packet() for loopback
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
Message-id: <20210629034247.3286477-7-jmaloy@redhat.com>
|
|
Patchwork-id: 101792
|
|
O-Subject: [RHEL-8.4.0.z qemu-kvm PATCH v2 6/9] rtl8139: switch to use qemu_receive_packet() for loopback
|
|
Bugzilla: 1932917
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
|
From: Alexander Bulekov <alxndr@bu.edu>
|
|
|
|
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>
|
|
|
|
(cherry picked from commit 5311fb805a4403bba024e83886fa0e7572265de4)
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.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 21d80e96cf..ccb04faa4c 100644
|
|
--- a/hw/net/rtl8139.c
|
|
+++ b/hw/net/rtl8139.c
|
|
@@ -1793,7 +1793,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);
|
|
--
|
|
2.27.0
|
|
|