Commit 47ed39e0 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-5.7' of git://git.infradead.org/nvme into block-5.7 

Pull NVMe fix from Christoph.

* 'nvme-5.7' of git://git.infradead.org/nvme:
  nvme: prevent double free in nvme_alloc_ns() error handling
parents d205bde7 132be623

drivers/nvme/host/core.c

+2 −0
Original line number Diff line number Diff line
@@ -3642,6 +3642,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 


	return;

 out_put_disk:

	/* prevent double queue cleanup */

	ns->disk->queue = NULL;

	put_disk(ns->disk);

 out_unlink_ns:

	mutex_lock(&ctrl->subsys->lock);