Skip to contentSkip to conversation

fsi: master-ast-cf: Fix memory leak

PATCH In review Gustavo A. R. Silva 2 participants 3 messages Jul 25, 2018 – Jul 26, 2018 FSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fsi: master-ast-cf: Fix memory leak

In case memory resources for *fw* were allocated, release them before return.

Addresses-Coverity-ID: 1472044 ("Resource leak")

Fixes 6a794a27daca ("fsi: master-ast-cf: Add new FSI master using Aspeed ColdFire")
---
 drivers/fsi/fsi-master-ast-cf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/fsi/fsi-master-ast-cf.c +4 -2
index c4a3557..e39a4630 100644
@@ -861,7 +861,8 @@ static int load_copro_firmware(struct fsi_master_acf *master)
 	if (sig != wanted_sig) {
 		dev_err(master->dev, "Failed to locate image sig %04x in FW blob\n",
 			wanted_sig);
-		return -ENODEV;
+		rc = -ENODEV;
+		goto release_fw;
 	}
 	if (size > master->cf_mem_size) {
 		dev_err(master->dev, "FW size (%zd) bigger than memory reserve (%zd)\n",
@@ -870,8 +871,9 @@ static int load_copro_firmware(struct fsi_master_acf *master)
 	} else {
 		memcpy_toio(master->cf_mem, data, size);
 	}
-	release_firmware(fw);
 
+release_fw:
+	release_firmware(fw);
 	return rc;
 }
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 6 lines · Gustavo A. R. Silva

In case memory resources for *fw* were allocated, release them before return.

Addresses-Coverity-ID: 1472044 ("Resource leak")

Fixes 6a794a27daca ("fsi: master-ast-cf: Add new FSI master using Aspeed ColdFire")

Thanks Gustavo !

I'll apply before I send my next pull request to Greg !

Cheers,
Ben.

Quoted 29 lines
---
 drivers/fsi/fsi-master-ast-cf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/fsi/fsi-master-ast-cf.c +4 -2
index c4a3557..e39a4630 100644
@@ -861,7 +861,8 @@ static int load_copro_firmware(struct fsi_master_acf *master)
 	if (sig != wanted_sig) {
 		dev_err(master->dev, "Failed to locate image sig %04x in FW blob\n",
 			wanted_sig);
-		return -ENODEV;
+		rc = -ENODEV;
+		goto release_fw;
 	}
 	if (size > master->cf_mem_size) {
 		dev_err(master->dev, "FW size (%zd) bigger than memory reserve (%zd)\n",
@@ -870,8 +871,9 @@ static int load_copro_firmware(struct fsi_master_acf *master)
 	} else {
 		memcpy_toio(master->cf_mem, data, size);
 	}
-	release_firmware(fw);
 
+release_fw:
+	release_firmware(fw);
 	return rc;
 }
 
#2 lore raw
Quoted 10 lines · Benjamin Herrenschmidt
Quoted 6 lines · Gustavo A. R. Silva

In case memory resources for *fw* were allocated, release them before return.

Addresses-Coverity-ID: 1472044 ("Resource leak")

Fixes 6a794a27daca ("fsi: master-ast-cf: Add new FSI master using Aspeed ColdFire")

Thanks Gustavo !

Glad to help. :)

Quoted 2 lines

I'll apply before I send my next pull request to Greg !

Thanks
--
Gustavo