From: Wu Bo <wubo40@huawei.com>
Date: Wed, 19 May 2021 05:01:09 +0000 (+0800)
Subject: nvmet: fix memory leak in nvmet_alloc_ctrl()
X-Git-Tag: v5.10.40~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4720f29acb3fe67aa8aa71e6b675b079d193aaeb;p=thirdparty%2Fkernel%2Fstable.git

nvmet: fix memory leak in nvmet_alloc_ctrl()

[ Upstream commit fec356a61aa3d3a66416b4321f1279e09e0f256f ]

When creating ctrl in nvmet_alloc_ctrl(), if the cntlid_min is larger
than cntlid_max of the subsystem, and jumps to the
"out_free_changed_ns_list" label, but the ctrl->sqs lack of be freed.
Fix this by jumping to the "out_free_sqs" label.

Fixes: 94a39d61f80f ("nvmet: make ctrl-id configurable")
Signed-off-by: Wu Bo <wubo40@huawei.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 870d06cfd815a..46e4f7ea34c8b 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -1360,7 +1360,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
 		goto out_free_changed_ns_list;
 
 	if (subsys->cntlid_min > subsys->cntlid_max)
-		goto out_free_changed_ns_list;
+		goto out_free_sqs;
 
 	ret = ida_simple_get(&cntlid_ida,
 			     subsys->cntlid_min, subsys->cntlid_max,