yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-pcnet-switch-to-use-qemu_receive_packet-for-loopback.patch

a6baaf
From 3427c5573a7ab788e0c39e30b4d0ed5db85f03b3 Mon Sep 17 00:00:00 2001
a6baaf
From: Jon Maloy <jmaloy@redhat.com>
a6baaf
Date: Tue, 29 Jun 2021 03:42:45 -0400
a6baaf
Subject: [PATCH 7/9] pcnet: switch to use qemu_receive_packet() for loopback
a6baaf
MIME-Version: 1.0
a6baaf
Content-Type: text/plain; charset=UTF-8
a6baaf
Content-Transfer-Encoding: 8bit
a6baaf
a6baaf
RH-Author: Jon Maloy <jmaloy@redhat.com>
a6baaf
Message-id: <20210629034247.3286477-8-jmaloy@redhat.com>
a6baaf
Patchwork-id: 101791
a6baaf
O-Subject: [RHEL-8.4.0.z qemu-kvm PATCH v2 7/9] pcnet: switch to use qemu_receive_packet() for loopback
a6baaf
Bugzilla: 1932917
a6baaf
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
a6baaf
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
a6baaf
RH-Acked-by: Thomas Huth <thuth@redhat.com>
a6baaf
a6baaf
From: Alexander Bulekov <alxndr@bu.edu>
a6baaf
a6baaf
This patch switches to use qemu_receive_packet() which can detect
a6baaf
reentrancy and return early.
a6baaf
a6baaf
This is intended to address CVE-2021-3416.
a6baaf
a6baaf
Cc: Prasad J Pandit <ppandit@redhat.com>
a6baaf
Cc: qemu-stable@nongnu.org
a6baaf
Buglink: https://bugs.launchpad.net/qemu/+bug/1917085
a6baaf
Reviewed-by: Philippe Mathieu-Daudé 
a6baaf
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
a6baaf
Signed-off-by: Jason Wang <jasowang@redhat.com>
a6baaf
a6baaf
(cherry picked from commit 99ccfaa1edafd79f7a3a0ff7b58ae4da7c514928)
a6baaf
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
a6baaf
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
a6baaf
---
a6baaf
 hw/net/pcnet.c | 2 +-
a6baaf
 1 file changed, 1 insertion(+), 1 deletion(-)
a6baaf
a6baaf
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
a6baaf
index f3f18d8598..dcd3fc4948 100644
a6baaf
--- a/hw/net/pcnet.c
a6baaf
+++ b/hw/net/pcnet.c
a6baaf
@@ -1250,7 +1250,7 @@ txagain:
a6baaf
             if (BCR_SWSTYLE(s) == 1)
a6baaf
                 add_crc = !GET_FIELD(tmd.status, TMDS, NOFCS);
a6baaf
             s->looptest = add_crc ? PCNET_LOOPTEST_CRC : PCNET_LOOPTEST_NOCRC;
a6baaf
-            pcnet_receive(qemu_get_queue(s->nic), s->buffer, s->xmit_pos);
a6baaf
+            qemu_receive_packet(qemu_get_queue(s->nic), s->buffer, s->xmit_pos);
a6baaf
             s->looptest = 0;
a6baaf
         } else {
a6baaf
             if (s->nic) {
a6baaf
-- 
a6baaf
2.27.0
a6baaf