From: Stefan Weil via <qemu-trivial@nongnu.org>
Date: Sun, 24 Dec 2023 11:43:14 +0000 (+0100)
Subject: virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy
X-Git-Tag: v9.0.0-rc0~130^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d819fc9516a4ec71e37a6c9edfcd285b7f98c2dc;p=thirdparty%2Fqemu.git

virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy

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>
---

diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index 6debd4401e0..97a302cf497 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;