]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: sunxi: fix a leaked reference by adding missing of_node_put
authorWen Yang <wen.yang99@zte.com.cn>
Tue, 5 Mar 2019 11:32:57 +0000 (19:32 +0800)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Mon, 18 Mar 2019 07:11:12 +0000 (08:11 +0100)
The call to of_get_next_child returns a node pointer with refcount
incremented thus it must be explicitly decremented after the last
usage.

Detected by coccinelle with the following warnings:
./arch/arm/mach-sunxi/mc_smp.c:110:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 97, but without a corresponding object release within this functio
./arch/arm/mach-sunxi/platsmp.c:138:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 129, but without a corresponding object release within this function

Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org (open list)
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
arch/arm/mach-sunxi/mc_smp.c
arch/arm/mach-sunxi/platsmp.c

index b4037b603897d62e15eeafb099c4ef1163328d29..239084cf8192d3b30c7e00fd0aa5c0bbb8c2a11b 100644 (file)
@@ -89,6 +89,7 @@ static bool sunxi_core_is_cortex_a15(unsigned int core, unsigned int cluster)
 {
        struct device_node *node;
        int cpu = cluster * SUNXI_CPUS_PER_CLUSTER + core;
+       bool is_compatible;
 
        node = of_cpu_device_node_get(cpu);
 
@@ -107,7 +108,9 @@ static bool sunxi_core_is_cortex_a15(unsigned int core, unsigned int cluster)
                return false;
        }
 
-       return of_device_is_compatible(node, "arm,cortex-a15");
+       is_compatible = of_device_is_compatible(node, "arm,cortex-a15");
+       of_node_put(node);
+       return is_compatible;
 }
 
 static int sunxi_cpu_power_switch_set(unsigned int cpu, unsigned int cluster,
index 8fb5088464db3dc932d367ff8272e303d1401b48..e4c28ac44b251bbed3dec6847471fb1df8552340 100644 (file)
@@ -133,6 +133,7 @@ static void __init sun8i_smp_prepare_cpus(unsigned int max_cpus)
        }
 
        prcm_membase = of_iomap(node, 0);
+       of_node_put(node);
        if (!prcm_membase) {
                pr_err("Couldn't map A23 PRCM registers\n");
                return;
@@ -146,6 +147,7 @@ static void __init sun8i_smp_prepare_cpus(unsigned int max_cpus)
        }
 
        cpucfg_membase = of_iomap(node, 0);
+       of_node_put(node);
        if (!cpucfg_membase)
                pr_err("Couldn't map A23 CPU config registers\n");