nvme-core: fix memory leak in dhchap_secret_store
PATCH 1/2 nvme-core: fix memory leak in dhchap_secret_store
Free dhchap_secret in nvme_ctrl_dhchap_secret_store() before we return when nvme_auth_generate_key() returns error.
--- drivers/nvme/host/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +3 -1
@@ -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;
Signature · 1 line
2.40.0
PATCH 2/2 nvme-core: fix memory leak in dhchap_ctrl_secret
Free dhchap_secret in nvme_ctrl_dhchap_ctrl_secret_store() before we return when nvme_auth_generate_key() returns error.
--- drivers/nvme/host/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +3 -1
@@ -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;
Signature · 1 line
2.40.0
Needs a fixes tag
Quoted 14 lines · Chaitanya Kulkarni
Free
dhchap_secretinnvme_ctrl_dhchap_secret_store()before we return whennvme_auth_generate_key()returns error.Signed-off-by Chaitanya Kulkarni <[email protected]>--- drivers/nvme/host/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/nvme/host/core.c +0
-0@@ -3814,8 +3814,10 @@ static ssize_t nvme_ctrl_dhchap_secret_store(struct device *dev,int ret;
drivers/nvme/host/core.c static ssize_t nvme_ctrl_dhchap_secret_store(struct device *dev, · line 3823
Quoted 10 lines
drivers/nvme/host/core.c +3
-1ret =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:
Quoted 30 lines · Sagi Grimberg
Needs a fixes tag
Quoted 14 lines · Chaitanya Kulkarni
Free
dhchap_secretinnvme_ctrl_dhchap_secret_store()before we return whennvme_auth_generate_key()returns error.Signed-off-by Chaitanya Kulkarni <[email protected]>---
drivers/nvme/host/core.c| 4 +++-1 file changed, 3 insertions(+), 1 deletion(-)drivers/nvme/host/core.c +0
-0@@ -3814,8 +3814,10 @@ static ssize_t nvme_ctrl_dhchap_secret_store(struct device *dev,drivers/nvme/host/core.c static ssize_t · line 3823
Quoted 10 lines
drivers/nvme/host/core.c +3
-1int 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:
Quoted 1 line
Reviewed-by Sagi Grimberg <[email protected]>
thanks I'll send out V2 with fixes and reviewed-by tag.
-ck
Quoted 14 lines · Chaitanya Kulkarni
Free
dhchap_secretinnvme_ctrl_dhchap_secret_store()before we return whennvme_auth_generate_key()returns error.Signed-off-by Chaitanya Kulkarni <[email protected]>--- drivers/nvme/host/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/nvme/host/core.c +0
-0@@ -3814,8 +3814,10 @@ static ssize_t nvme_ctrl_dhchap_secret_store(struct device *dev,int ret;
drivers/nvme/host/core.c static ssize_t nvme_ctrl_dhchap_secret_store(struct device *dev, · line 3823
Quoted 10 lines
drivers/nvme/host/core.c +3
-1ret =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 ?