37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
From: Jason Wang <jasowang@redhat.com>
|
||
|
|
Date: Wed, 24 Feb 2021 13:00:01 +0800
|
||
|
|
Subject: msf2-mac: switch to use qemu_receive_packet() for loopback
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Git-commit: 26194a58f4eb83c5bdf4061a1628508084450ba1
|
||
|
|
|
||
|
|
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: Jason Wang <jasowang@redhat.com>
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
hw/net/msf2-emac.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
|
||
|
|
index 32ba9e84124496fe22f165095d61..3e6206044f8b441c9222f28cc1ec 100644
|
||
|
|
--- a/hw/net/msf2-emac.c
|
||
|
|
+++ b/hw/net/msf2-emac.c
|
||
|
|
@@ -158,7 +158,7 @@ static void msf2_dma_tx(MSF2EmacState *s)
|
||
|
|
* R_CFG1 bit 0 is set.
|
||
|
|
*/
|
||
|
|
if (s->regs[R_CFG1] & R_CFG1_LB_EN_MASK) {
|
||
|
|
- nc->info->receive(nc, buf, size);
|
||
|
|
+ qemu_receive_packet(nc, buf, size);
|
||
|
|
} else {
|
||
|
|
qemu_send_packet(nc, buf, size);
|
||
|
|
}
|