[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL V2 14/20] lan9118: switch to use qemu_receive_packet() for loopbac
From: |
Jason Wang |
Subject: |
[PULL V2 14/20] lan9118: switch to use qemu_receive_packet() for loopback |
Date: |
Mon, 15 Mar 2021 17:14:27 +0800 |
From: Alexander Bulekov <alxndr@bu.edu>
This patch switches to use qemu_receive_packet() 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: Alexander Bulekov <alxndr@bu.edu>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/lan9118.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index abc7962..6aff424 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -680,7 +680,7 @@ static void do_tx_packet(lan9118_state *s)
/* FIXME: Honor TX disable, and allow queueing of packets. */
if (s->phy_control & 0x4000) {
/* This assumes the receive routine doesn't touch the VLANClient. */
- lan9118_receive(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
+ qemu_receive_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
} else {
qemu_send_packet(qemu_get_queue(s->nic), s->txp->data, s->txp->len);
}
--
2.7.4
- [PULL V2 04/20] e1000: fail early for evil descriptor, (continued)
- [PULL V2 04/20] e1000: fail early for evil descriptor, Jason Wang, 2021/03/15
- [PULL V2 05/20] net: introduce qemu_receive_packet(), Jason Wang, 2021/03/15
- [PULL V2 06/20] e1000: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15
- [PULL V2 07/20] dp8393x: switch to use qemu_receive_packet() for loopback packet, Jason Wang, 2021/03/15
- [PULL V2 08/20] msf2-mac: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15
- [PULL V2 09/20] sungem: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15
- [PULL V2 10/20] tx_pkt: switch to use qemu_receive_packet_iov() for loopback, Jason Wang, 2021/03/15
- [PULL V2 11/20] rtl8139: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15
- [PULL V2 13/20] cadence_gem: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15
- [PULL V2 12/20] pcnet: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/15
- [PULL V2 14/20] lan9118: switch to use qemu_receive_packet() for loopback,
Jason Wang <=
- [PULL V2 15/20] pvrdma: wean code off pvrdma_ring.h kernel header, Jason Wang, 2021/03/15
- [PULL V2 16/20] qapi: net: Add query-netdev command, Jason Wang, 2021/03/15
- [PULL V2 19/20] hmp: Use QAPI NetdevInfo in hmp_info_network, Jason Wang, 2021/03/15
- [PULL V2 20/20] net: Do not fill legacy info_str for backends, Jason Wang, 2021/03/15
- [PULL V2 18/20] net: Move NetClientState.info_str to dynamic allocations, Jason Wang, 2021/03/15