2015-11-18 09:48:22

by Tobias Klauser

Subject: [PATCH] fpga manager: Fix firmware resource leak on error

If fpga_mgr_buf_load() fails, the firmware resource previously allocated
by request_firmware() is leaked. Fix it by calling release_firmware()
regardless of the return value of fpga_mgr_buf_load().

Found by the Coverity scanner (CID 1339653).

Fixes: 6a8c3be7ec8e ("add FPGA manager core")
Signed-off-by: Tobias Klauser <[email protected]>
---
drivers/fpga/fpga-mgr.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index a24f5cb877e0..aad6439c3692 100644
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -122,12 +122,10 @@ int fpga_mgr_firmware_load(struct fpga_manager *mgr, u32 flags,
}

ret = fpga_mgr_buf_load(mgr, flags, fw->data, fw->size);
- if (ret)
- return ret;

release_firmware(fw);

- return 0;
+ return ret;
}
EXPORT_SYMBOL_GPL(fpga_mgr_firmware_load);

--
2.6.3.368.gf34be46.dirty

2015-11-18 15:30:44

by atull

Subject: Re: [PATCH] fpga manager: Fix firmware resource leak on error

On Wed, 18 Nov 2015, Tobias Klauser wrote:

> If fpga_mgr_buf_load() fails, the firmware resource previously allocated
> by request_firmware() is leaked. Fix it by calling release_firmware()
> regardless of the return value of fpga_mgr_buf_load().
>
> Found by the Coverity scanner (CID 1339653).
>
> Fixes: 6a8c3be7ec8e ("add FPGA manager core")
> Signed-off-by: Tobias Klauser <[email protected]>
> ---
> drivers/fpga/fpga-mgr.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
> index a24f5cb877e0..aad6439c3692 100644
> --- a/drivers/fpga/fpga-mgr.c
> +++ b/drivers/fpga/fpga-mgr.c
> @@ -122,12 +122,10 @@ int fpga_mgr_firmware_load(struct fpga_manager *mgr, u32 flags,
> }
>
> ret = fpga_mgr_buf_load(mgr, flags, fw->data, fw->size);
> - if (ret)
> - return ret;
>
> release_firmware(fw);
>
> - return 0;
> + return ret;
> }
> EXPORT_SYMBOL_GPL(fpga_mgr_firmware_load);
>
> --
> 2.6.3.368.gf34be46.dirty
>
>
>

Thanks Tobias!

Acked-by: Alan Tull <[email protected]>

Alan