62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
|
From f4623ea611a74c684b0097b98a803cbe7ffb0825 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
Date: Thu, 18 Jul 2024 09:26:55 -0400
|
||
|
|
Subject: [PATCH 5/6] hw/char/virtio-serial-bus: Protect from DMA re-entrancy
|
||
|
|
bugs
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
RH-MergeRequest: 380: QEMU: virtio: DMA reentrancy issue leads to double free vulnerability
|
||
|
|
RH-Jira: RHEL-32276
|
||
|
|
RH-Acked-by: Gerd Hoffmann <None>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [5/6] fc8a445ebf6e763cd1482cd1f7ee23e5b5bbb388 (redhat/rhel/src/qemu-kvm/jons-qemu-kvm-2)
|
||
|
|
|
||
|
|
JIRA: https://issues.redhat.com/browse/RHEL-32276
|
||
|
|
CVE: CVE-2024-3446
|
||
|
|
Upstream: Merged
|
||
|
|
|
||
|
|
commit b4295bff25f7b50de1d9cc94a9c6effd40056bca
|
||
|
|
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Date: Thu Apr 4 20:56:35 2024 +0200
|
||
|
|
|
||
|
|
hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs
|
||
|
|
|
||
|
|
Replace qemu_bh_new_guarded() by virtio_bh_new_guarded()
|
||
|
|
so the bus and device use the same guard. Otherwise the
|
||
|
|
DMA-reentrancy protection can be bypassed.
|
||
|
|
|
||
|
|
Fixes: CVE-2024-3446
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Suggested-by: Alexander Bulekov <alxndr@bu.edu>
|
||
|
|
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Message-Id: <20240409105537.18308-4-philmd@linaro.org>
|
||
|
|
|
||
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
---
|
||
|
|
hw/char/virtio-serial-bus.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
|
||
|
|
index f18124b155..791b7ac59e 100644
|
||
|
|
--- a/hw/char/virtio-serial-bus.c
|
||
|
|
+++ b/hw/char/virtio-serial-bus.c
|
||
|
|
@@ -985,8 +985,7 @@ static void virtser_port_device_realize(DeviceState *dev, Error **errp)
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
- port->bh = qemu_bh_new_guarded(flush_queued_data_bh, port,
|
||
|
|
- &dev->mem_reentrancy_guard);
|
||
|
|
+ port->bh = virtio_bh_new_guarded(dev, flush_queued_data_bh, port);
|
||
|
|
port->elem = NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|