[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/16] lan9118: switch to use qemu_receive_packet() for loopback
From: |
Jason Wang |
Subject: |
[PULL 15/16] lan9118: switch to use qemu_receive_packet() for loopback |
Date: |
Fri, 12 Mar 2021 14:16:25 +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 06/16] net: introduce qemu_receive_packet(), (continued)
- [PULL 06/16] net: introduce qemu_receive_packet(), Jason Wang, 2021/03/12
- [PULL 05/16] e1000: fail early for evil descriptor, Jason Wang, 2021/03/12
- [PULL 07/16] e1000: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 08/16] dp8393x: switch to use qemu_receive_packet() for loopback packet, Jason Wang, 2021/03/12
- [PULL 09/16] msf2-mac: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 10/16] sungem: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 11/16] tx_pkt: switch to use qemu_receive_packet_iov() for loopback, Jason Wang, 2021/03/12
- [PULL 12/16] rtl8139: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 13/16] pcnet: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 14/16] cadence_gem: switch to use qemu_receive_packet() for loopback, Jason Wang, 2021/03/12
- [PULL 15/16] lan9118: switch to use qemu_receive_packet() for loopback,
Jason Wang <=
- [PULL 16/16] pvrdma: wean code off pvrdma_ring.h kernel header, Jason Wang, 2021/03/12
- Re: [PULL 00/16] Net patches, Peter Maydell, 2021/03/14