cacheinfo: Decrement refcount in cache_setup_of_node()
authorPierre Gondois <pierre.gondois@arm.com>
Wed, 26 Oct 2022 18:59:54 +0000 (20:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Nov 2022 17:33:28 +0000 (18:33 +0100)
Refcounts to DT nodes are only incremented in the function
and never decremented. Decrease the refcounts when necessary.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Link: https://lore.kernel.org/r/20221026185954.991547-1-pierre.gondois@arm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/cacheinfo.c

index 4b5cd08c5a657f7341d13dd652a2689230942632..04317cde800cb4d702008bcc397bbd5049599aa6 100644 (file)
@@ -196,7 +196,7 @@ static void cache_of_set_props(struct cacheinfo *this_leaf,
 
 static int cache_setup_of_node(unsigned int cpu)
 {
-       struct device_node *np;
+       struct device_node *np, *prev;
        struct cacheinfo *this_leaf;
        unsigned int index = 0;
 
@@ -206,19 +206,24 @@ static int cache_setup_of_node(unsigned int cpu)
                return -ENOENT;
        }
 
+       prev = np;
+
        while (index < cache_leaves(cpu)) {
                this_leaf = per_cpu_cacheinfo_idx(cpu, index);
-               if (this_leaf->level != 1)
+               if (this_leaf->level != 1) {
                        np = of_find_next_cache_node(np);
-               else
-                       np = of_node_get(np);/* cpu node itself */
-               if (!np)
-                       break;
+                       of_node_put(prev);
+                       prev = np;
+                       if (!np)
+                               break;
+               }
                cache_of_set_props(this_leaf, np);
                this_leaf->fw_token = np;
                index++;
        }
 
+       of_node_put(np);
+
        if (index != cache_leaves(cpu)) /* not all OF nodes populated */
                return -ENOENT;