virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy

Commit Message

Stefan Weil Dec. 24, 2023, 11:43 a.m. UTC

Fixes: CID 1532828
Fixes: b6948ab01d ("virtio-blk: add iothread-vq-mapping parameter")
Signed-off-by: Stefan Weil <[e-mail]>
---
 hw/block/dataplane/virtio-blk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Michael Tokarev Dec. 25, 2023, 8:02 a.m. UTC | #1

24.12.2023 14:43, Stefan Weil:
> Fixes: CID 1532828
> Fixes: b6948ab01d ("virtio-blk: add iothread-vq-mapping parameter")
> Signed-off-by: Stefan Weil <[e-mail]>

Applied to the trivial-patches tree, thank you!

/mjt

Philippe Mathieu-Daudé Dec. 26, 2023, 3:22 p.m. UTC | #2

On 24/12/23 12:43, Stefan Weil via wrote:
> Fixes: CID 1532828
> Fixes: b6948ab01d ("virtio-blk: add iothread-vq-mapping parameter")
> Signed-off-by: Stefan Weil <[e-mail]>
> ---
>   hw/block/dataplane/virtio-blk.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Patch

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;