]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
nvme-loop: fix a possible use-after-free when destroying the admin queue
authorSagi Grimberg <sagi@grimberg.me>
Mon, 27 Feb 2017 16:44:45 +0000 (18:44 +0200)
committerSagi Grimberg <sagi@grimberg.me>
Thu, 16 Mar 2017 16:41:17 +0000 (18:41 +0200)
we need to destroy the nvmet sq and let it finish gracefully
before continue to cleanup the queue.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
drivers/nvme/target/loop.c

index d1f06e7768ff1d7ff6ee787ff6d94eb01576252f..74e04a0855d452c3e15c966408a43b7d34202c70 100644 (file)
@@ -288,9 +288,9 @@ static struct blk_mq_ops nvme_loop_admin_mq_ops = {
 
 static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl)
 {
+       nvmet_sq_destroy(&ctrl->queues[0].nvme_sq);
        blk_cleanup_queue(ctrl->ctrl.admin_q);
        blk_mq_free_tag_set(&ctrl->admin_tag_set);
-       nvmet_sq_destroy(&ctrl->queues[0].nvme_sq);
 }
 
 static void nvme_loop_free_ctrl(struct nvme_ctrl *nctrl)