Subject: [PATCH 06/10] tx_pkt: switch to use qemu_receive_packet_iov() for loopback

From: Jason Wang <[email-masked]>
Date: Wed, 24 Feb 2021 13:27:52 +0800

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 <[email-masked]>
Cc: [email-masked]
Reviewed-by: Philippe Mathieu-Daudé <[email-masked]>
Signed-off-by: Jason Wang <[email-masked]>

Upstream-Status: Backport [8c552542b81e56ff532dd27ec6e5328954bdda73]
CVE: CVE-2021-3416

Signed-off-by: Sakib Sajal <[email-masked]>
---
 hw/net/net_tx_pkt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: qemu-4.2.0/hw/net/net_tx_pkt.c
===================================================================
--- qemu-4.2.0.orig/hw/net/net_tx_pkt.c
+++ qemu-4.2.0/hw/net/net_tx_pkt.c
@@ -544,7 +544,7 @@ static inline void net_tx_pkt_sendv(stru
     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);
     }