Commit 6bc9d9d6 authored Oct 21, 2015 by Julia Lawall Committed by Stephen Boyd Oct 21, 2015

clk: add missing of_node_put

for_each_matching_node_and_match 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 e1,e2,e;
local idexpression np;
@@

 for_each_matching_node_and_match(np, e1, e2) {
   ... when != of_node_put(np)
       when != e = np
(
   return np;
|
+  of_node_put(np);
?  return ...;
)
   ...
 }
// </smpl>

Besides the problem identified by the semantic patch, this patch adds an
of_node_get in front of saving np in a field of parent, to account for the
fact that this value will be put on going on to the next element in the
iteration, and then adds of_node_puts in the two loops where the parent
pointer can be freed.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

parent 63243a4d

drivers/clk/clk.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -3197,13 +3197,15 @@ void __init of_clk_init(const struct of_device_id *matches)
		list_for_each_entry_safe(clk_provider, next,
		&clk_provider_list, node) {
		list_del(&clk_provider->node);
		of_node_put(clk_provider->np);
		kfree(clk_provider);
		}
		of_node_put(np);
		return;
		}

		parent->clk_init_cb = match->data;
		parent->np = np;
		parent->np = of_node_get(np);
		list_add_tail(&parent->node, &clk_provider_list);
		}

		@@ -3217,6 +3219,7 @@ void __init of_clk_init(const struct of_device_id *matches)
		of_clk_set_defaults(clk_provider->np, true);

		list_del(&clk_provider->node);
		of_node_put(clk_provider->np);
		kfree(clk_provider);
		is_init_done = true;
		}

Admin message