| From 023ce62f0a788ad3a8233c7a828554bceeafd031 Mon Sep 17 00:00:00 2001 |
| From: Alexander Bulekov <alxndr@bu.edu> |
| Date: Mon, 1 Mar 2021 10:33:34 -0500 |
| Subject: [PATCH 08/10] pcnet: 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 |
| Buglink: https://bugs.launchpad.net/qemu/+bug/1917085 |
| Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com |
| Signed-off-by: Alexander Bulekov <alxndr@bu.edu> |
| Signed-off-by: Jason Wang <jasowang@redhat.com> |
| |
| Upstream-Status: Backport [99ccfaa1edafd79f7a3a0ff7b58ae4da7c514928] |
| CVE: CVE-2021-3416 |
| |
| Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> |
| --- |
| hw/net/pcnet.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c |
| index f3f18d859..dcd3fc494 100644 |
| --- a/hw/net/pcnet.c |
| +++ b/hw/net/pcnet.c |
| @@ -1250,7 +1250,7 @@ txagain: |
| if (BCR_SWSTYLE(s) == 1) |
| add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS); |
| s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC; |
| - pcnet_receive(qemu_get_queue(s->nic), s->buffer, s->xmit_pos); |
| + qemu_receive_packet(qemu_get_queue(s->nic), s->buffer, s->xmit_pos); |
| s->looptest = 0; |
| } else { |
| if (s->nic) { |
| -- |
| 2.29.2 |
| |