OSDN Git Service

fsi: master-ast-cf: Fix memory leak
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Wed, 25 Jul 2018 13:38:32 +0000 (08:38 -0500)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 25 Jul 2018 23:56:17 +0000 (09:56 +1000)
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")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
drivers/fsi/fsi-master-ast-cf.c

index b59abcf..6a36220 100644 (file)
@@ -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;
 }