| From 9ac5345344b75995bc96d171eaa5dc8d26bf0e21 Mon Sep 17 00:00:00 2001 |
| From: Jason Wang <jasowang@redhat.com> |
| Date: Wed, 24 Feb 2021 13:00:01 +0800 |
| Subject: [PATCH 04/10] 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 |
| |
| 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> |
| |
| Upstream-Status: Backport [26194a58f4eb83c5bdf4061a1628508084450ba1] |
| CVE: CVE-2021-3416 |
| |
| Signed-off-by: Sakib Sajal <sakib.sajal@windriver.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 32ba9e841..3e6206044 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); |
| } |
| -- |
| 2.29.2 |
| |