|
 |
1072c8 |
From 128b97f6049144af3c1a41ceb8e8583419edcd69 Mon Sep 17 00:00:00 2001
|
|
|
a6baaf |
From: Jon Maloy <jmaloy@redhat.com>
|
|
|
a6baaf |
Date: Tue, 29 Jun 2021 03:42:40 -0400
|
|
|
a6baaf |
Subject: [PATCH 2/9] e1000: 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-3-jmaloy@redhat.com>
|
|
|
a6baaf |
Patchwork-id: 101784
|
|
|
a6baaf |
O-Subject: [RHEL-8.4.0.z qemu-kvm PATCH v2 2/9] e1000: 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: Jason Wang <jasowang@redhat.com>
|
|
|
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é <philmd@redhat.com>
|
|
|
a6baaf |
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
a6baaf |
|
|
|
a6baaf |
(cherry picked from commit 1caff0340f49c93d535c6558a5138d20d475315c)
|
|
|
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/e1000.c | 2 +-
|
|
|
a6baaf |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
a6baaf |
|
|
|
a6baaf |
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
|
|
|
1072c8 |
index fe56bccd52..8680b7d46b 100644
|
|
|
a6baaf |
--- a/hw/net/e1000.c
|
|
|
a6baaf |
+++ b/hw/net/e1000.c
|
|
|
a6baaf |
@@ -547,7 +547,7 @@ e1000_send_packet(E1000State *s, const uint8_t *buf, int size)
|
|
|
a6baaf |
|
|
|
a6baaf |
NetClientState *nc = qemu_get_queue(s->nic);
|
|
|
a6baaf |
if (s->phy_reg[PHY_CTRL] & MII_CR_LOOPBACK) {
|
|
|
a6baaf |
- nc->info->receive(nc, buf, size);
|
|
|
a6baaf |
+ qemu_receive_packet(nc, buf, size);
|
|
|
a6baaf |
} else {
|
|
|
a6baaf |
qemu_send_packet(nc, buf, size);
|
|
|
a6baaf |
}
|
|
|
a6baaf |
--
|
|
|
a6baaf |
2.27.0
|
|
|
a6baaf |
|