54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 199915a03857c1e4e0a6ac90a46496b1a8abd702 Mon Sep 17 00:00:00 2001
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
|
Date: Tue, 29 Jun 2021 03:42:43 -0400
|
|
Subject: [PATCH 5/9] tx_pkt: switch to use qemu_receive_packet_iov() 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-6-jmaloy@redhat.com>
|
|
Patchwork-id: 101788
|
|
O-Subject: [RHEL-8.4.0.z qemu-kvm PATCH v2 5/9] tx_pkt: switch to use qemu_receive_packet_iov() 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: Jason Wang <jasowang@redhat.com>
|
|
|
|
This patch switches to use qemu_receive_receive_iov() 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
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
|
(cherry picked from commit 8c552542b81e56ff532dd27ec6e5328954bdda73)
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/net/net_tx_pkt.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
|
|
index 54d4c3bbd0..646cdfaf4d 100644
|
|
--- a/hw/net/net_tx_pkt.c
|
|
+++ b/hw/net/net_tx_pkt.c
|
|
@@ -544,7 +544,7 @@ static inline void net_tx_pkt_sendv(struct NetTxPkt *pkt,
|
|
NetClientState *nc, const struct iovec *iov, int iov_cnt)
|
|
{
|
|
if (pkt->is_loopback) {
|
|
- nc->info->receive_iov(nc, iov, iov_cnt);
|
|
+ qemu_receive_packet_iov(nc, iov, iov_cnt);
|
|
} else {
|
|
qemu_sendv_packet(nc, iov, iov_cnt);
|
|
}
|
|
--
|
|
2.27.0
|
|
|