Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame^] | 1 | From 9ac5345344b75995bc96d171eaa5dc8d26bf0e21 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jason Wang <jasowang@redhat.com> |
| 3 | Date: Wed, 24 Feb 2021 13:00:01 +0800 |
| 4 | Subject: [PATCH 04/10] msf2-mac: switch to use qemu_receive_packet() for |
| 5 | loopback |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | |
| 10 | This patch switches to use qemu_receive_packet() which can detect |
| 11 | reentrancy and return early. |
| 12 | |
| 13 | This is intended to address CVE-2021-3416. |
| 14 | |
| 15 | Cc: Prasad J Pandit <ppandit@redhat.com> |
| 16 | Cc: qemu-stable@nongnu.org |
| 17 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> |
| 18 | Signed-off-by: Jason Wang <jasowang@redhat.com> |
| 19 | |
| 20 | Upstream-Status: Backport [26194a58f4eb83c5bdf4061a1628508084450ba1] |
| 21 | CVE: CVE-2021-3416 |
| 22 | |
| 23 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> |
| 24 | --- |
| 25 | hw/net/msf2-emac.c | 2 +- |
| 26 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 27 | |
| 28 | diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c |
| 29 | index 32ba9e841..3e6206044 100644 |
| 30 | --- a/hw/net/msf2-emac.c |
| 31 | +++ b/hw/net/msf2-emac.c |
| 32 | @@ -158,7 +158,7 @@ static void msf2_dma_tx(MSF2EmacState *s) |
| 33 | * R_CFG1 bit 0 is set. |
| 34 | */ |
| 35 | if (s->regs[R_CFG1] & R_CFG1_LB_EN_MASK) { |
| 36 | - nc->info->receive(nc, buf, size); |
| 37 | + qemu_receive_packet(nc, buf, size); |
| 38 | } else { |
| 39 | qemu_send_packet(nc, buf, size); |
| 40 | } |
| 41 | -- |
| 42 | 2.29.2 |
| 43 | |