37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
From: Jason Wang <jasowang@redhat.com>
|
||
|
|
Date: Wed, 24 Feb 2021 13:27:52 +0800
|
||
|
|
Subject: 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
|
||
|
|
|
||
|
|
Git-commit: 8c552542b81e56ff532dd27ec6e5328954bdda73
|
||
|
|
|
||
|
|
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>
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.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 da262edc3e95e71f2aa8a52026f9..1f9aa59eca258a51c462be114888 100644
|
||
|
|
--- a/hw/net/net_tx_pkt.c
|
||
|
|
+++ b/hw/net/net_tx_pkt.c
|
||
|
|
@@ -553,7 +553,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);
|
||
|
|
}
|