[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/7] virtio-blk: Fix potential nullpointer read access in virtio_b
From: |
Michael Tokarev |
Subject: |
[PULL 7/7] virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy |
Date: |
Mon, 25 Dec 2023 11:10:07 +0300 |
From: Stefan Weil via <qemu-trivial@nongnu.org>
Fixes: CID 1532828
Fixes: b6948ab01d ("virtio-blk: add iothread-vq-mapping parameter")
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/block/dataplane/virtio-blk.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index 6debd4401e..97a302cf49 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -152,7 +152,7 @@ bool virtio_blk_data_plane_create(VirtIODevice *vdev,
VirtIOBlkConf *conf,
void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s)
{
VirtIOBlock *vblk;
- VirtIOBlkConf *conf = s->conf;
+ VirtIOBlkConf *conf;
if (!s) {
return;
@@ -160,6 +160,7 @@ void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s)
vblk = VIRTIO_BLK(s->vdev);
assert(!vblk->dataplane_started);
+ conf = s->conf;
if (conf->iothread_vq_mapping_list) {
IOThreadVirtQueueMappingList *node;
--
2.39.2
- [PULL 0/7] Trivial patches for 2023-12-25, Michael Tokarev, 2023/12/25
- [PULL 1/7] target/riscv/kvm: do not use non-portable strerrorname_np(), Michael Tokarev, 2023/12/25
- [PULL 2/7] qemu-options: Unify the help entries for cocoa, Michael Tokarev, 2023/12/25
- [PULL 5/7] accel/kvm: Turn DPRINTF macro use into tracepoints, Michael Tokarev, 2023/12/25
- [PULL 3/7] qemu-options: Tell more for -display cocoa, Michael Tokarev, 2023/12/25
- [PULL 4/7] docs/tools/qemu-img.rst: fix typo (sumarizes), Michael Tokarev, 2023/12/25
- [PULL 6/7] include/ui/rect.h: fix qemu_rect_init() mis-assignment, Michael Tokarev, 2023/12/25
- [PULL 7/7] virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy,
Michael Tokarev <=
- Re: [PULL 0/7] Trivial patches for 2023-12-25, Philippe Mathieu-Daudé, 2023/12/26
- Re: [PULL 0/7] Trivial patches for 2023-12-25, Stefan Hajnoczi, 2023/12/26