Commit 82f68756 authored Feb 03, 2016 by Amitoj Kaur Chawla Committed by Rob Herring Feb 13, 2016

of: resolver: Add missing of_node_get and of_node_put



In __of_find_node_by_full_name, add an of_node_get when detecting the
desired element, to ensure that it ends up with a reference count that is
one greater than on entering the function.

Also in __of_find_node_by_full_name, add an of_node_put on breaking
out of the for_each_child_of_node loop, to ensure that the reference
count of the returned value is not double incremented. This change
was made using Coccinelle.

The semantic patch used for this is as follows:

// <smpl>
@@
expression e;
local idexpression n;
@@

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

Finally, add an of_node_put in for_each_child_of_node in the function
__of_adjust_phandle_ref after the value returned by
__of_find_node_by_full_name is no longer useful.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>

parent 4d44e095

drivers/of/resolver.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -36,13 +36,15 @@ static struct device_node __of_find_node_by_full_name(struct device_node node,

		/* check */
		if (of_node_cmp(node->full_name, full_name) == 0)
		return node;
		return of_node_get(node);

		for_each_child_of_node(node, child) {
		found = __of_find_node_by_full_name(child, full_name);
		if (found != NULL)
		if (found != NULL) {
		of_node_put(child);
		return found;
		}
		}

		return NULL;
		}
		@@ -174,6 +176,7 @@ static int __of_adjust_phandle_ref(struct device_node *node,
		if (of_prop_cmp(sprop->name, propstr) == 0)
		break;
		}
		of_node_put(refnode);

		if (!sprop) {
		pr_err("%s: Could not find property '%s'\n",

Admin message