From: Chaitanya Kulkarni <kch@nvidia.com>
To: <linux-nvme@lists.infradead.org>
Cc: <hare@suse.de>, <kbusch@kernel.org>, <hch@lst.de>,
<sagi@grimberg.me>, Chaitanya Kulkarni <kch@nvidia.com>
Subject: [PATCH V2 2/4] nvme-core: fix memory leak in dhchap_ctrl_secret
Date: Fri, 28 Apr 2023 00:31:13 -0700 [thread overview]
Message-ID: <20230428073115.22987-3-kch@nvidia.com> (raw)
In-Reply-To: <20230428073115.22987-1-kch@nvidia.com>
Free dhchap_secret in nvme_ctrl_dhchap_ctrl_secret_store() before we
return when nvme_auth_generate_key() returns error.
Fixes: f50fff73d620 ("nvme: implement In-Band authentication")
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
drivers/nvme/host/core.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c7793991faeb..42e90d00fc40 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3882,8 +3882,10 @@ static ssize_t nvme_ctrl_dhchap_ctrl_secret_store(struct device *dev,
int ret;
ret = nvme_auth_generate_key(dhchap_secret, &key);
- if (ret)
+ if (ret) {
+ kfree(dhchap_secret);
return ret;
+ }
kfree(opts->dhchap_ctrl_secret);
opts->dhchap_ctrl_secret = dhchap_secret;
ctrl_key = ctrl->ctrl_key;
@@ -3891,7 +3893,8 @@ static ssize_t nvme_ctrl_dhchap_ctrl_secret_store(struct device *dev,
ctrl->ctrl_key = key;
mutex_unlock(&ctrl->dhchap_auth_mutex);
nvme_auth_free_key(ctrl_key);
- }
+ } else
+ kfree(dhchap_secret);
/* Start re-authentication */
dev_info(ctrl->device, "re-authenticating controller\n");
queue_work(nvme_wq, &ctrl->dhchap_auth_work);
--
2.40.0
next prev parent reply other threads:[~2023-04-28 7:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-28 7:31 [PATCH V2 0/4] nvme: init ctrl memleak and debugfs fix Chaitanya Kulkarni
2023-04-28 7:31 ` [PATCH V2 1/4] nvme-core: fix memory leak in dhchap_secret_store Chaitanya Kulkarni
2023-05-01 13:14 ` Sagi Grimberg
2023-04-28 7:31 ` Chaitanya Kulkarni [this message]
2023-05-01 13:14 ` [PATCH V2 2/4] nvme-core: fix memory leak in dhchap_ctrl_secret Sagi Grimberg
2023-04-28 7:31 ` [PATCH V2 3/4] nvme-core: add missing fault-injection cleanup Chaitanya Kulkarni
2023-05-01 13:14 ` Sagi Grimberg
2023-05-06 3:20 ` Yi Zhang
2023-04-28 7:31 ` [PATCH V2 4/4] nvme-core: fix dev_pm_qos memleak Chaitanya Kulkarni
2023-05-01 13:14 ` Sagi Grimberg
2023-05-06 3:14 ` Yi Zhang
2023-04-28 8:41 ` [PATCH V2 0/4] nvme: init ctrl memleak and debugfs fix Chaitanya Kulkarni
2023-05-12 20:29 ` Christoph Hellwig
2023-05-15 17:13 ` Keith Busch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230428073115.22987-3-kch@nvidia.com \
--to=kch@nvidia.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.