OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtio-blk: Fix potential nullpointer read access in virtio_blk_data_plane_destroy

Browse Source 
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>
This commit is contained in:
Stefan Weil via 2023-12-24 12:43:14 +01:00 committed by Michael Tokarev
parent 9d5b42beb6
commit d819fc9516
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/block/dataplane/virtio-blk.c
View File

@ -152,7 +152,7 @@ bool virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *conf,
void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s) void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s)
{ {
VirtIOBlock *vblk; VirtIOBlock *vblk;
VirtIOBlkConf *conf = s->conf; VirtIOBlkConf *conf;
if (!s) { if (!s) {
return; return;
@ -160,6 +160,7 @@ void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s)
vblk = VIRTIO_BLK(s->vdev); vblk = VIRTIO_BLK(s->vdev);
assert(!vblk->dataplane_started); assert(!vblk->dataplane_started);
conf = s->conf;
if (conf->iothread_vq_mapping_list) { if (conf->iothread_vq_mapping_list) {
IOThreadVirtQueueMappingList *node; IOThreadVirtQueueMappingList *node;