Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e73bbf64 authored by Tobias Klauser's avatar Tobias Klauser Committed by Greg Kroah-Hartman
Browse files

fpga: region: release FPGA region reference in error path 



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: default avatarTobias Klauser <tklauser@distanz.ch>
Acked-by: default avatarMoritz Fischer <mdf@kernel.org>
Signed-off-by: default avatarAlan Tull <atull@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d721f9bb

drivers/fpga/fpga-region.c

+3 −1
Original line number Diff line number Diff line
@@ -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;