[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/16] hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 04/16] hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs |
Date: |
Wed, 10 Apr 2024 11:13:03 +0200 |
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-5-philmd@linaro.org>
---
hw/virtio/virtio-crypto.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
index fe1313f2ad..bbe8aa4b99 100644
--- a/hw/virtio/virtio-crypto.c
+++ b/hw/virtio/virtio-crypto.c
@@ -1080,8 +1080,8 @@ static void virtio_crypto_device_realize(DeviceState
*dev, Error **errp)
vcrypto->vqs[i].dataq =
virtio_add_queue(vdev, 1024, virtio_crypto_handle_dataq_bh);
vcrypto->vqs[i].dataq_bh =
- qemu_bh_new_guarded(virtio_crypto_dataq_bh, &vcrypto->vqs[i],
- &dev->mem_reentrancy_guard);
+ virtio_bh_new_guarded(dev, virtio_crypto_dataq_bh,
+ &vcrypto->vqs[i]);
vcrypto->vqs[i].vcrypto = vcrypto;
}
--
2.41.0
- [PULL 00/16] Misc HW patches for 2024-04-10, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 01/16] hw/virtio: Introduce virtio_bh_new_guarded() helper, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 02/16] hw/display/virtio-gpu: Protect from DMA re-entrancy bugs, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 04/16] hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs,
Philippe Mathieu-Daudé <=
- [PULL 03/16] hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 05/16] qemu-options: Fix CXL Fixed Memory Window interleave-granularity typo, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 06/16] hw/block/nand: Factor nand_load_iolen() method out, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 07/16] hw/block/nand: Have blk_load() take unsigned offset and return boolean, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 08/16] hw/block/nand: Fix out-of-bound access in NAND block buffer, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 09/16] hw/misc/applesmc: Do not call DeviceReset from DeviceRealize, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 10/16] hw/misc/applesmc: Fix memory leak in reset() handler, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 11/16] backends/cryptodev: Do not abort for invalid session ID, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 12/16] hw/net/lan9118: Replace magic '2048' value by MIL_TXFIFO_SIZE definition, Philippe Mathieu-Daudé, 2024/04/10
- [PULL 13/16] hw/net/lan9118: Fix overflow in MIL TX FIFO, Philippe Mathieu-Daudé, 2024/04/10