Skip to contentSkip to conversation

nvme-core: fix memory leak in dhchap_secret_store

PATCH Superseded Chaitanya Kulkarni 4 participants 5 messages Apr 27, 2023 NVMe

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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
index 518c759346f0..5a9d97c0c0c1 100644
@@ -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
#1 lore raw

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
index 5a9d97c0c0c1..44408c0c1762 100644
@@ -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
maintainer Reviewed-by on v1 1/2
#2 lore raw
In reply to Chaitanya Kulkarni

Needs a fixes tag

Quoted 14 lines · Chaitanya Kulkarni

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 +0 -0
index 518c759346f0..5a9d97c0c0c1 100644
@@ -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 -1
 
  		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:

#3 lore raw
Quoted 30 lines · Sagi Grimberg

Needs a fixes tag

Quoted 14 lines · Chaitanya Kulkarni

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 +0 -0
index 518c759346f0..5a9d97c0c0c1 100644
@@ -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 -1
           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:

Quoted 1 line

thanks I'll send out V2 with fixes and reviewed-by tag.

-ck

#4 lore raw
In reply to Chaitanya Kulkarni
Quoted 14 lines · Chaitanya Kulkarni

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 +0 -0
index 518c759346f0..5a9d97c0c0c1 100644
@@ -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 -1
 
  		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 ?