]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
virtio-blk: free vblk-vqs in error path of virtblk_probe()
authorHou Tao <houtao1@huawei.com>
Mon, 15 Jun 2020 04:14:59 +0000 (12:14 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jul 2020 07:36:31 +0000 (09:36 +0200)
[ Upstream commit e7eea44eefbdd5f0345a0a8b80a3ca1c21030d06 ]

Else there will be memory leak if alloc_disk() fails.

Fixes: 6a27b656fc02 ("block: virtio-blk: support multi virt queues per virtio-blk device")
Signed-off-by: Hou Tao <houtao1@huawei.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/block/virtio_blk.c

index 0e18eed62c575bf6a6f0e7164c8142e58041e264..2f15e38fb3f8c2d5670821bf0d651ef8daa7df4e 100644 (file)
@@ -879,6 +879,7 @@ out_put_disk:
        put_disk(vblk->disk);
 out_free_vq:
        vdev->config->del_vqs(vdev);
+       kfree(vblk->vqs);
 out_free_vblk:
        kfree(vblk);
 out_free_index: