of: resolver: Add of_node_put() before return and break
PATCH 1/1 of: resolver: Add of_node_put() before return and break
Each iteration of for_each_child_of_node puts the previous node, but in the case of a return or break from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the return or break in three places.
Issue found with Coccinelle.
Signed-off-by Nishka Dasgupta <[email protected]>
--- drivers/of/resolver.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/of/resolver.c +9 -3
@@ -206,16 +206,22 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,for_each_child_of_node (local_fixups, child) {for_each_child_of_node (overlay, overlay_child) -if (!node_name_cmp (child, overlay_child)) +if (!node_name_cmp (child, overlay_child)) { +of_node_put (overlay_child);break ; + } -if (!overlay_child) +if (!overlay_child) { +of_node_put (child);return -EINVAL ; + } err =adjust_local_phandle_references (child, overlay_child, phandle_delta); -if (err) +if (err) { +of_node_put (child);return err; + } }return 0 ;
Signature · 1 line
2.19.1
Quoted 11 lines · Nishka Dasgupta
Each iteration of
for_each_child_of_nodeputs the previous node, but in the case of a return or break from the middle of the loop, there is no put, thus causing a memory leak. Hence add anof_node_putbefore the return or break in three places.
Issue found with Coccinelle.Signed-off-by Nishka Dasgupta <[email protected]>--- drivers/of/resolver.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
Applied, thanks.
Rob