* [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store
@ 2023-04-27 8:04 Chaitanya Kulkarni
2023-04-27 8:04 ` [PATCH 2/2] nvme-core: fix memory leak in dhchap_ctrl_secret Chaitanya Kulkarni
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2023-04-27 8:04 UTC (permalink / raw)
To: hare; +Cc: kbusch, hch, sagi, linux-nvme, Chaitanya Kulkarni
Free dhchap_secret in nvme_ctrl_dhchap_secret_store() before we return
when nvme_auth_generate_key() returns error.
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
drivers/nvme/host/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 518c759346f0..5a9d97c0c0c1 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3814,8 +3814,10 @@ static ssize_t nvme_ctrl_dhchap_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_secret);
opts->dhchap_secret = dhchap_secret;
host_key = ctrl->host_key;
--
2.40.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] nvme-core: fix memory leak in dhchap_ctrl_secret
2023-04-27 8:04 [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store Chaitanya Kulkarni
@ 2023-04-27 8:04 ` Chaitanya Kulkarni
2023-04-27 8:09 ` [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store Sagi Grimberg
2023-04-27 12:32 ` Max Gurtovoy
2 siblings, 0 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2023-04-27 8:04 UTC (permalink / raw)
To: hare; +Cc: kbusch, hch, sagi, linux-nvme, Chaitanya Kulkarni
Free dhchap_secret in nvme_ctrl_dhchap_ctrl_secret_store() before we
return when nvme_auth_generate_key() returns error.
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
drivers/nvme/host/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 5a9d97c0c0c1..44408c0c1762 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3870,8 +3870,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;
--
2.40.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store
2023-04-27 8:04 [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store Chaitanya Kulkarni
2023-04-27 8:04 ` [PATCH 2/2] nvme-core: fix memory leak in dhchap_ctrl_secret Chaitanya Kulkarni
@ 2023-04-27 8:09 ` Sagi Grimberg
2023-04-27 8:32 ` Chaitanya Kulkarni
2023-04-27 12:32 ` Max Gurtovoy
2 siblings, 1 reply; 5+ messages in thread
From: Sagi Grimberg @ 2023-04-27 8:09 UTC (permalink / raw)
To: Chaitanya Kulkarni, hare; +Cc: kbusch, hch, linux-nvme
Needs a fixes tag
On 4/27/23 11:04, Chaitanya Kulkarni wrote:
> Free dhchap_secret in nvme_ctrl_dhchap_secret_store() before we return
> when nvme_auth_generate_key() returns error.
>
> Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
> ---
> drivers/nvme/host/core.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 518c759346f0..5a9d97c0c0c1 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -3814,8 +3814,10 @@ static ssize_t nvme_ctrl_dhchap_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_secret);
> opts->dhchap_secret = dhchap_secret;
> host_key = ctrl->host_key;
Other than that, for this and the next one:
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store
2023-04-27 8:09 ` [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store Sagi Grimberg
@ 2023-04-27 8:32 ` Chaitanya Kulkarni
0 siblings, 0 replies; 5+ messages in thread
From: Chaitanya Kulkarni @ 2023-04-27 8:32 UTC (permalink / raw)
To: Sagi Grimberg, Chaitanya Kulkarni, hare@suse.de
Cc: kbusch@kernel.org, hch@lst.de, linux-nvme@lists.infradead.org
On 4/27/23 01:09, Sagi Grimberg wrote:
> Needs a fixes tag
>
> On 4/27/23 11:04, Chaitanya Kulkarni wrote:
>> Free dhchap_secret in nvme_ctrl_dhchap_secret_store() before we return
>> when nvme_auth_generate_key() returns error.
>>
>> Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
>> ---
>> drivers/nvme/host/core.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
>> index 518c759346f0..5a9d97c0c0c1 100644
>> --- a/drivers/nvme/host/core.c
>> +++ b/drivers/nvme/host/core.c
>> @@ -3814,8 +3814,10 @@ static ssize_t
>> nvme_ctrl_dhchap_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_secret);
>> opts->dhchap_secret = dhchap_secret;
>> host_key = ctrl->host_key;
>
> Other than that, for this and the next one:
>
> Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
thanks I'll send out V2 with fixes and reviewed-by tag.
-ck
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store
2023-04-27 8:04 [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store Chaitanya Kulkarni
2023-04-27 8:04 ` [PATCH 2/2] nvme-core: fix memory leak in dhchap_ctrl_secret Chaitanya Kulkarni
2023-04-27 8:09 ` [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store Sagi Grimberg
@ 2023-04-27 12:32 ` Max Gurtovoy
2 siblings, 0 replies; 5+ messages in thread
From: Max Gurtovoy @ 2023-04-27 12:32 UTC (permalink / raw)
To: Chaitanya Kulkarni, hare; +Cc: kbusch, hch, sagi, linux-nvme
On 27/04/2023 11:04, Chaitanya Kulkarni wrote:
> Free dhchap_secret in nvme_ctrl_dhchap_secret_store() before we return
> when nvme_auth_generate_key() returns error.
>
> Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
> ---
> drivers/nvme/host/core.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 518c759346f0..5a9d97c0c0c1 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -3814,8 +3814,10 @@ static ssize_t nvme_ctrl_dhchap_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_secret);
> opts->dhchap_secret = dhchap_secret;
> host_key = ctrl->host_key;
This doesn't solve the leak we have in case strcmp return 0 (also for
patch 2/2).
Can you please address before sending the next version ?
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-04-27 12:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-27 8:04 [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store Chaitanya Kulkarni
2023-04-27 8:04 ` [PATCH 2/2] nvme-core: fix memory leak in dhchap_ctrl_secret Chaitanya Kulkarni
2023-04-27 8:09 ` [PATCH 1/2] nvme-core: fix memory leak in dhchap_secret_store Sagi Grimberg
2023-04-27 8:32 ` Chaitanya Kulkarni
2023-04-27 12:32 ` Max Gurtovoy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox