of: base: Shift refcount decrement in of_find_last_cache_level()

pierregondois · robherring · commit 7a7f58575483 · 2022-10-03T11:21:37.000-05:00
Currently, of_find_next_cache_node() and of_property_read_u32() are called on objects after their refcount have been decremented. Re-order the calls to decrement the refcount after the function calls. Signed-off-by: Pierre Gondois <pierre.gondois@arm.com> Link: https://lore.kernel.org/r/20220930144936.2882481-1-pierre.gondois@arm.com Signed-off-by: Rob Herring <robh@kernel.org>
diff --git a/drivers/of/base.c b/drivers/of/base.c
@@ -2088,12 +2088,13 @@ int of_find_last_cache_level(unsigned int cpu)
 	struct device_node *prev = NULL, *np = of_cpu_device_node_get(cpu);
 
 	while (np) {
+		of_node_put(prev);
 		prev = np;
-		of_node_put(np);
 		np = of_find_next_cache_node(np);
 	}
 
 	of_property_read_u32(prev, "cache-level", &cache_level);
+	of_node_put(prev);
 
 	return cache_level;
 }

Original file line number	Diff line number	Diff line change
`@@ -2088,12 +2088,13 @@ int of_find_last_cache_level(unsigned int cpu)`
`2088`	`2088`	`struct device_node prev = NULL, np = of_cpu_device_node_get(cpu);`
`2089`	`2089`
`2090`	`2090`	`while (np) {`
	`2091`	`+ of_node_put(prev);`
`2091`	`2092`	`prev = np;`
`2092`		`- of_node_put(np);`
`2093`	`2093`	`np = of_find_next_cache_node(np);`
`2094`	`2094`	`}`
`2095`	`2095`
`2096`	`2096`	`of_property_read_u32(prev, "cache-level", &cache_level);`
	`2097`	`+ of_node_put(prev);`
`2097`	`2098`
`2098`	`2099`	`return cache_level;`
`2099`	`2100`	`}`