* [PATCH] of: resolver: Add of_node_put() before return and break
@ 2019-07-16 5:43 Nishka Dasgupta
2019-08-12 22:52 ` Rob Herring
0 siblings, 1 reply; 2+ messages in thread
From: Nishka Dasgupta @ 2019-07-16 5:43 UTC (permalink / raw)
To: pantelis.antoniou, frowand.list, robh+dt, devicetree; +Cc: Nishka Dasgupta
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 <nishkadg.linux@gmail.com>
---
drivers/of/resolver.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index c1b67dd7cd6e..83c766233181 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -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;
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] of: resolver: Add of_node_put() before return and break
2019-07-16 5:43 [PATCH] of: resolver: Add of_node_put() before return and break Nishka Dasgupta
@ 2019-08-12 22:52 ` Rob Herring
0 siblings, 0 replies; 2+ messages in thread
From: Rob Herring @ 2019-08-12 22:52 UTC (permalink / raw)
To: Nishka Dasgupta; +Cc: pantelis.antoniou, frowand.list, robh+dt, devicetree
On Tue, 16 Jul 2019 11:13:30 +0530, Nishka Dasgupta wrote:
> 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 <nishkadg.linux@gmail.com>
> ---
> drivers/of/resolver.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
Applied, thanks.
Rob
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-12 22:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-16 5:43 [PATCH] of: resolver: Add of_node_put() before return and break Nishka Dasgupta
2019-08-12 22:52 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).