Skip to content

Commit

Permalink
fsi: master-ast-cf: Fix memory leak
Browse files Browse the repository at this point in the history
In case memory resources for *fw* were allocated, release them
before return.

Addresses-Coverity-ID: 1472044 ("Resource leak")
Fixes: 6a794a2 ("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>
  • Loading branch information
Gustavo A. R. Silva authored and Benjamin Herrenschmidt committed Jul 25, 2018
1 parent 375cac7 commit 502defb
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/fsi/fsi-master-ast-cf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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;
}

Expand Down

0 comments on commit 502defb

Please sign in to comment.