FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-03 17:44:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fpga: region: release of_parse_phandle nodes after use

Browse Source 
Both fpga_region_get_manager() and fpga_region_get_bridges() call
of_parse_phandle(), but nothing calls of_node_put() on the returned
struct device_node pointers.  Make sure to do that to stop their
reference counters getting out of whack.

Fixes: 0fa20cdfcc1f ("fpga: fpga-region: device tree control for FPGA")
Cc: <stable@vger.kernel.org> # 4.10+
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Alan Tull <atull@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2017-11-15 16:33:12 -06:00 committed by Greg Kroah-Hartman
parent 397f33cb0a
commit 0f5eb15459
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/fpga/of-fpga-region.c
View File

@ -73,6 +73,7 @@ static struct fpga_manager *of_fpga_region_get_mgr(struct device_node *np)
mgr_node = of_parse_phandle(np, "fpga-mgr", 0); mgr_node = of_parse_phandle(np, "fpga-mgr", 0);
if (mgr_node) { if (mgr_node) {
mgr = of_fpga_mgr_get(mgr_node); mgr = of_fpga_mgr_get(mgr_node);
of_node_put(mgr_node);
of_node_put(np); of_node_put(np);
return mgr; return mgr;
} }
@ -120,10 +121,13 @@ static int of_fpga_region_get_bridges(struct fpga_region *region)
parent_br = region_np->parent; parent_br = region_np->parent;
/* If overlay has a list of bridges, use it. */ /* If overlay has a list of bridges, use it. */
if (of_parse_phandle(info->overlay, "fpga-bridges", 0)) br = of_parse_phandle(info->overlay, "fpga-bridges", 0);
if (br) {
of_node_put(br);
np = info->overlay; np = info->overlay;
else } else {
np = region_np; np = region_np;
}
for (i = 0; ; i++) { for (i = 0; ; i++) {
br = of_parse_phandle(np, "fpga-bridges", i); br = of_parse_phandle(np, "fpga-bridges", i);
@ -131,12 +135,15 @@ static int of_fpga_region_get_bridges(struct fpga_region *region)
break; break;
/* If parent bridge is in list, skip it. */ /* If parent bridge is in list, skip it. */
if (br == parent_br) if (br == parent_br) {
of_node_put(br);
continue; continue;
}
/* If node is a bridge, get it and add to list */ /* If node is a bridge, get it and add to list */
ret = of_fpga_bridge_get_to_list(br, info, ret = of_fpga_bridge_get_to_list(br, info,
&region->bridge_list); &region->bridge_list);
of_node_put(br);
/* If any of the bridges are in use, give up */ /* If any of the bridges are in use, give up */
if (ret == -EBUSY) { if (ret == -EBUSY) {