nvme: prevent double free in nvme_alloc_ns() error handling
authorNiklas Cassel <niklas.cassel@wdc.com>
Mon, 27 Apr 2020 12:34:41 +0000 (14:34 +0200)
committerChristoph Hellwig <hch@lst.de>
Mon, 27 Apr 2020 15:08:06 +0000 (17:08 +0200)
commit132be62387c7a72a38872676c18b0dfae264adb8
tree6bc279c67a6338e21deba9bc13f4d6e90bb5ec79
parentd205bde78fa53e1ce256b1f7f65ede9696d73ee5
nvme: prevent double free in nvme_alloc_ns() error handling

When jumping to the out_put_disk label, we will call put_disk(), which will
trigger a call to disk_release(), which calls blk_put_queue().

Later in the cleanup code, we do blk_cleanup_queue(), which will also call
blk_put_queue().

Putting the queue twice is incorrect, and will generate a KASAN splat.

Set the disk->queue pointer to NULL, before calling put_disk(), so that the
first call to blk_put_queue() will not free the queue.

The second call to blk_put_queue() uses another pointer to the same queue,
so this call will still free the queue.

Fixes: 85136c010285 ("lightnvm: simplify geometry enumeration")
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/core.c