aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2017-02-27 11:44:45 -0500
committerSagi Grimberg <sagi@grimberg.me>2017-03-16 12:41:17 -0400
commite4c5d3762e2d6d274bd1cc948c47063becfa2103 (patch)
treea4fce8dbb95558ffd1de0124ea8d4f4f5821c206
parentefd4b81abbe1ac753717f2f10cd3dab8bed6c103 (diff)
nvme-loop: fix a possible use-after-free when destroying the admin queue
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>
-rw-r--r--drivers/nvme/target/loop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index d1f06e7768ff..74e04a0855d4 100644
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -288,9 +288,9 @@ static struct blk_mq_ops nvme_loop_admin_mq_ops = {
288 288
289static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl) 289static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl)
290{ 290{
291 nvmet_sq_destroy(&ctrl->queues[0].nvme_sq);
291 blk_cleanup_queue(ctrl->ctrl.admin_q); 292 blk_cleanup_queue(ctrl->ctrl.admin_q);
292 blk_mq_free_tag_set(&ctrl->admin_tag_set); 293 blk_mq_free_tag_set(&ctrl->admin_tag_set);
293 nvmet_sq_destroy(&ctrl->queues[0].nvme_sq);
294} 294}
295 295
296static void nvme_loop_free_ctrl(struct nvme_ctrl *nctrl) 296static void nvme_loop_free_ctrl(struct nvme_ctrl *nctrl)