yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-tx_pkt-switch-to-use-qemu_receive_packet_iov-for-loo.patch

6e7d01
From 87cacc268f37758553ad93fefa8b312ed0bd2520 Mon Sep 17 00:00:00 2001
6e7d01
From: Jon Maloy <jmaloy@redhat.com>
6e7d01
Date: Tue, 29 Jun 2021 03:42:43 -0400
6e7d01
Subject: [PATCH 5/9] tx_pkt: switch to use qemu_receive_packet_iov() for
6e7d01
 loopback
6e7d01
MIME-Version: 1.0
6e7d01
Content-Type: text/plain; charset=UTF-8
6e7d01
Content-Transfer-Encoding: 8bit
6e7d01
6e7d01
RH-Author: Jon Maloy <jmaloy@redhat.com>
6e7d01
Message-id: <20210629034247.3286477-6-jmaloy@redhat.com>
6e7d01
Patchwork-id: 101788
6e7d01
O-Subject: [RHEL-8.4.0.z qemu-kvm PATCH v2 5/9] tx_pkt: switch to use qemu_receive_packet_iov() for loopback
6e7d01
Bugzilla: 1932917
6e7d01
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
6e7d01
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
6e7d01
RH-Acked-by: Thomas Huth <thuth@redhat.com>
6e7d01
6e7d01
From: Jason Wang <jasowang@redhat.com>
6e7d01
6e7d01
This patch switches to use qemu_receive_receive_iov() which can detect
6e7d01
reentrancy and return early.
6e7d01
6e7d01
This is intended to address CVE-2021-3416.
6e7d01
6e7d01
Cc: Prasad J Pandit <ppandit@redhat.com>
6e7d01
Cc: qemu-stable@nongnu.org
6e7d01
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
6e7d01
Signed-off-by: Jason Wang <jasowang@redhat.com>
6e7d01
6e7d01
(cherry picked from commit 8c552542b81e56ff532dd27ec6e5328954bdda73)
6e7d01
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
6e7d01
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
6e7d01
---
6e7d01
 hw/net/net_tx_pkt.c | 2 +-
6e7d01
 1 file changed, 1 insertion(+), 1 deletion(-)
6e7d01
6e7d01
diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
6e7d01
index 54d4c3bbd0..646cdfaf4d 100644
6e7d01
--- a/hw/net/net_tx_pkt.c
6e7d01
+++ b/hw/net/net_tx_pkt.c
6e7d01
@@ -544,7 +544,7 @@ static inline void net_tx_pkt_sendv(struct NetTxPkt *pkt,
6e7d01
     NetClientState *nc, const struct iovec *iov, int iov_cnt)
6e7d01
 {
6e7d01
     if (pkt->is_loopback) {
6e7d01
-        nc->info->receive_iov(nc, iov, iov_cnt);
6e7d01
+        qemu_receive_packet_iov(nc, iov, iov_cnt);
6e7d01
     } else {
6e7d01
         qemu_sendv_packet(nc, iov, iov_cnt);
6e7d01
     }
6e7d01
-- 
6e7d01
2.27.0
6e7d01