block/nvme: Remove memory leak
PATCH 1/1 block/nvme: Remove memory leak
--- block/nvme.c | 1 + 1 file changed, 1 insertion(+)
block/nvme.c +1 -0
@@ -163,6 +163,7 @@ static void nvme_init_queue(BlockDriverState *bs, NVMeQueue *q, } r =qemu_vfio_dma_map (s->vfio, q->queue, bytes, false, &q->iova);if (r) { +qemu_vfree (q->queue);error_setg (errp,"Cannot map queue" ); } }
Signature · 1 line
2.21.1
Quoted 22 lines · Philippe Mathieu-Daudé
Fixes bdd6a90a9 ("Add VFIO based NVMe driver")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/nvme.c | 1 + 1 file changed, 1 insertion(+)block/nvme.c +1
-0@@ -163,6 +163,7 @@ static void nvme_init_queue(BlockDriverState *bs, NVMeQueue *q, } r =qemu_vfio_dma_map (s->vfio, q->queue, bytes, false, &q->iova);if (r) { +qemu_vfree (q->queue);error_setg (errp,"Cannot map queue" ); } }Signature · 1 line
2.21.1
Are we adding a double free with this change?
IIUC when nvme_init_queue() fails in the nvme_create_queue_pair() we already call the nvme_free_queue_pair() that frees sq.queue and cq.queue.
I think your patch make the code cleaner, freeing the buffer near the allocation during an error, maybe we can also set q->queue to NULL after the qemu_vfree().
Thanks,
Stefano
Quoted 26 lines · Stefano Garzarella
Quoted 22 lines · Philippe Mathieu-Daudé
Fixes bdd6a90a9 ("Add VFIO based NVMe driver")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/nvme.c | 1 + 1 file changed, 1 insertion(+)block/nvme.c +1
-0@@ -163,6 +163,7 @@ static void nvme_init_queue(BlockDriverState *bs, NVMeQueue *q, } r =qemu_vfio_dma_map (s->vfio, q->queue, bytes, false, &q->iova);if (r) { +qemu_vfree (q->queue);error_setg (errp,"Cannot map queue" ); } }Signature · 1 line
2.21.1Are we adding a double free with this change?
Quoted 3 lines
IIUC when
nvme_init_queue()fails in thenvme_create_queue_pair()we already call thenvme_free_queue_pair()that frees sq.queue and cq.queue.
Argh you are right, I missed that...
Quoted 8 lines
I think your patch make the code cleaner, freeing the buffer near the allocation during an error, maybe we can also set
q->queueto NULL after theqemu_vfree().Thanks,
Stefano