|
 |
a6baaf |
From 4044e97e37188a9844cc6cd66d8b7819acccb27e Mon Sep 17 00:00:00 2001
|
|
|
a6baaf |
From: Jon Maloy <jmaloy@redhat.com>
|
|
|
a6baaf |
Date: Tue, 29 Jun 2021 03:42:41 -0400
|
|
|
a6baaf |
Subject: [PATCH 3/9] dp8393x: switch to use qemu_receive_packet() for loopback
|
|
|
a6baaf |
packet
|
|
|
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-4-jmaloy@redhat.com>
|
|
|
a6baaf |
Patchwork-id: 101789
|
|
|
a6baaf |
O-Subject: [RHEL-8.4.0.z qemu-kvm PATCH v2 3/9] dp8393x: switch to use qemu_receive_packet() for loopback packet
|
|
|
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é
|
|
|
a6baaf |
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
a6baaf |
|
|
|
a6baaf |
(cherry picked from commit 331d2ac9ea307c990dc86e6493e8f0c48d14bb33)
|
|
|
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/dp8393x.c | 2 +-
|
|
|
a6baaf |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
a6baaf |
|
|
|
a6baaf |
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
|
|
|
a6baaf |
index 3d991af163..6d55b5de64 100644
|
|
|
a6baaf |
--- a/hw/net/dp8393x.c
|
|
|
a6baaf |
+++ b/hw/net/dp8393x.c
|
|
|
a6baaf |
@@ -482,7 +482,7 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
|
|
|
a6baaf |
s->regs[SONIC_TCR] |= SONIC_TCR_CRSL;
|
|
|
a6baaf |
if (nc->info->can_receive(nc)) {
|
|
|
a6baaf |
s->loopback_packet = 1;
|
|
|
a6baaf |
- nc->info->receive(nc, s->tx_buffer, tx_len);
|
|
|
a6baaf |
+ qemu_receive_packet(nc, s->tx_buffer, tx_len);
|
|
|
a6baaf |
}
|
|
|
a6baaf |
} else {
|
|
|
a6baaf |
/* Transmit packet */
|
|
|
a6baaf |
--
|
|
|
a6baaf |
2.27.0
|
|
|
a6baaf |
|