|
 |
1072c8 |
From e2cafb929acb74377754cb688419575b139b922a Mon Sep 17 00:00:00 2001
|
|
|
a6baaf |
From: Jon Maloy <jmaloy@redhat.com>
|
|
|
a6baaf |
Date: Tue, 29 Jun 2021 03:42:47 -0400
|
|
|
a6baaf |
Subject: [PATCH 9/9] lan9118: switch to use qemu_receive_packet() for loopback
|
|
|
a6baaf |
MIME-Version: 1.0
|
|
|
a6baaf |
Content-Type: text/plain; charset=UTF-8
|
|
|
a6baaf |
Content-Transfer-Encoding: 8bit
|
|
|
a6baaf |
|
|
|
a6baaf |
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
|
a6baaf |
Message-id: <20210629034247.3286477-10-jmaloy@redhat.com>
|
|
|
a6baaf |
Patchwork-id: 101790
|
|
|
a6baaf |
O-Subject: [RHEL-8.4.0.z qemu-kvm PATCH v2 9/9] lan9118: switch to use qemu_receive_packet() for loopback
|
|
|
a6baaf |
Bugzilla: 1932917
|
|
|
a6baaf |
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
a6baaf |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
a6baaf |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
a6baaf |
|
|
|
a6baaf |
From: Alexander Bulekov <alxndr@bu.edu>
|
|
|
a6baaf |
|
|
|
a6baaf |
This patch switches to use qemu_receive_packet() which can detect
|
|
|
a6baaf |
reentrancy and return early.
|
|
|
a6baaf |
|
|
|
a6baaf |
This is intended to address CVE-2021-3416.
|
|
|
a6baaf |
|
|
|
a6baaf |
Cc: Prasad J Pandit <ppandit@redhat.com>
|
|
|
a6baaf |
Cc: qemu-stable@nongnu.org
|
|
|
a6baaf |
Reviewed-by: Philippe Mathieu-Daudé
|
|
|
a6baaf |
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
|
|
a6baaf |
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
a6baaf |
|
|
|
a6baaf |
(cherry picked from commit 37cee01784ff0df13e5209517e1b3594a5e792d1)
|
|
|
a6baaf |
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
|
a6baaf |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
a6baaf |
---
|
|
|
a6baaf |
hw/net/lan9118.c | 2 +-
|
|
|
a6baaf |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
a6baaf |
|
|
|
a6baaf |
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
|
|
|
a6baaf |
index ed551f2178..7bb4633f0f 100644
|
|
|
a6baaf |
--- a/hw/net/lan9118.c
|
|
|
a6baaf |
+++ b/hw/net/lan9118.c
|
|
|
a6baaf |
@@ -667,7 +667,7 @@ static void do_tx_packet(lan9118_state *s)
|
|
|
a6baaf |
/* FIXME: Honor TX disable, and allow queueing of packets. */
|
|
|
a6baaf |
if (s->phy_control & 0x4000) {
|
|
|
a6baaf |
/* This assumes the receive routine doesn't touch the VLANClient. */
|
|
|
a6baaf |
- lan9118_receive(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
|
|
|
a6baaf |
+ qemu_receive_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
|
|
|
a6baaf |
} else {
|
|
|
a6baaf |
qemu_send_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
|
|
|
a6baaf |
}
|
|
|
a6baaf |
--
|
|
|
a6baaf |
2.27.0
|
|
|
a6baaf |
|