virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy

[PATCH] virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy

Stefan Weil via posted 1 patch 11 months, 1 week ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231224114314.420360-1-sw@weilnetz.de

Maintainers: Stefan Hajnoczi <stefanha@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>

hw/block/dataplane/virtio-blk.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Expand all Fold all

[PATCH] virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy

Posted by Stefan Weil via 11 months, 1 week ago

Fixes: CID 1532828
Fixes: b6948ab01d ("virtio-blk: add iothread-vq-mapping parameter")
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 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

Re: [PATCH] virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy

Posted by Philippe Mathieu-Daudé 11 months ago

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 <sw@weilnetz.de>
> ---
>   hw/block/dataplane/virtio-blk.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH] virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy

Posted by Michael Tokarev 11 months, 1 week ago

24.12.2023 14:43, Stefan Weil:
> Fixes: CID 1532828
> Fixes: b6948ab01d ("virtio-blk: add iothread-vq-mapping parameter")
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Applied to the trivial-patches tree, thank you!

/mjt