UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 6a794a27da ("fsi: master-ast-cf: Add new FSI master using Aspeed ColdFire")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Gustavo A. R. Silva 2018-07-25 08:38:32 -05:00 committed by Benjamin Herrenschmidt
parent 375cac7010
commit 502defbb47
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/fsi/fsi-master-ast-cf.c
View File

@ -861,7 +861,8 @@ static int load_copro_firmware(struct fsi_master_acf *master)
if (sig != wanted_sig) { if (sig != wanted_sig) {
dev_err(master->dev, "Failed to locate image sig %04x in FW blob\n", dev_err(master->dev, "Failed to locate image sig %04x in FW blob\n",
wanted_sig); wanted_sig);
return -ENODEV; rc = -ENODEV;
goto release_fw;
} }
if (size > master->cf_mem_size) { if (size > master->cf_mem_size) {
dev_err(master->dev, "FW size (%zd) bigger than memory reserve (%zd)\n", 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 { } else {
memcpy_toio(master->cf_mem, data, size); memcpy_toio(master->cf_mem, data, size);
} }
release_firmware(fw);
release_fw:
release_firmware(fw);
return rc; return rc;
} }