| From e2a48a3c7cc33dbbe89f896e0f07462cb04ff6b5 Mon Sep 17 00:00:00 2001 |
| From: Jason Wang <jasowang@redhat.com> |
| Date: Wed, 24 Feb 2021 12:13:22 +0800 |
| Subject: [PATCH 02/10] e1000: 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 [1caff0340f49c93d535c6558a5138d20d475315c] |
| CVE: CVE-2021-3416 |
| |
| Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> |
| --- |
| hw/net/e1000.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/hw/net/e1000.c b/hw/net/e1000.c |
| index d7d05ae30..cf22c4f07 100644 |
| --- a/hw/net/e1000.c |
| +++ b/hw/net/e1000.c |
| @@ -546,7 +546,7 @@ e1000_send_packet(E1000State *s, const uint8_t *buf, int size) |
| |
| NetClientState *nc = qemu_get_queue(s->nic); |
| if (s->phy_reg[PHY_CTRL] & MII_CR_LOOPBACK) { |
| - nc->info->receive(nc, buf, size); |
| + qemu_receive_packet(nc, buf, size); |
| } else { |
| qemu_send_packet(nc, buf, size); |
| } |
| -- |
| 2.29.2 |
| |