From: Tobias Klauser <tklau...@distanz.ch>

If fpga_region_get_manager() fails in fpga_region_program_fpga(), a
reference to the fpga_manager instance previously acquired through
fpga_region_get() is retained. Make sure to properly release it in the
error case by using a separate jump label which will call
fpga_region_put() in before returning.

Signed-off-by: Tobias Klauser <tklau...@distanz.ch>
Acked-by: Moritz Fischer <m...@kernel.org>
Signed-off-by: Alan Tull <at...@kernel.org>
---
 drivers/fpga/fpga-region.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index ae4c61a..3b6b2f4 100644
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -245,7 +245,8 @@ static int fpga_region_program_fpga(struct fpga_region 
*region,
        mgr = fpga_region_get_manager(region);
        if (IS_ERR(mgr)) {
                pr_err("failed to get fpga region manager\n");
-               return PTR_ERR(mgr);
+               ret = PTR_ERR(mgr);
+               goto err_put_region;
        }
 
        ret = fpga_region_get_bridges(region, overlay);
@@ -281,6 +282,7 @@ static int fpga_region_program_fpga(struct fpga_region 
*region,
        fpga_bridges_put(&region->bridge_list);
 err_put_mgr:
        fpga_mgr_put(mgr);
+err_put_region:
        fpga_region_put(region);
 
        return ret;
-- 
2.7.4

Reply via email to