Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1253637

[PATCH 1/4] of/overlay: add missing of_node_put

Show all headers | View raw

for_each_child_of_node performs an of_node_get on each iteration, so
a break out of the loop requires an of_node_put.

A simplified version of the semantic patch that fixes this problem is as
follows (http://coccinelle.lip6.fr):

// <smpl>
@@
expression root,e;
local idexpression child;
@@

 for_each_child_of_node(root, child) {
   ... when != of_node_put(child)
       when != e = child
(
   return child;
|
+  of_node_put(child);
?  return ...;
)
   ...
 }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 drivers/of/overlay.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 24e025f..54e5af9 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -149,6 +149,7 @@ static int of_overlay_apply_one(struct of_overlay *ov,
 			pr_err("%s: Failed to apply single node @%s/%s\n",
 					__func__, target->full_name,
 					child->name);
+			of_node_put(child);
 			return ret;
 		}
 	}
@@ -417,8 +418,10 @@ static int overlay_subtree_check(struct device_node *tree,
 		return 1;
 
 	for_each_child_of_node(tree, child) {
-		if (overlay_subtree_check(child, dn))
+		if (overlay_subtree_check(child, dn)) {
+			of_node_put(child);
 			return 1;
+		}
 	}
 
 	return 0;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-10-22 11:20 +0200
  [PATCH 4/4] of/irq: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-10-22 11:20 +0200
  [PATCH 3/4] of/unittest: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-10-22 11:20 +0200
  [PATCH 1/4] of/overlay: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-10-22 11:20 +0200
  Re: [PATCH 0/4] add missing of_node_put Rob Herring <robh+dt@kernel.org> - 2015-10-22 15:10 +0200
    Re: [PATCH 0/4] add missing of_node_put Julia Lawall <julia.lawall@lip6.fr> - 2015-10-22 15:30 +0200
  Re: [PATCH 0/4] add missing of_node_put Rob Herring <robh+dt@kernel.org> - 2015-10-22 17:10 +0200

csiph-web