Skip to contentSkip to conversation

ARM: ux500: Fix refcount leak in ux500_pm_domains_init

PATCH In review Miaoqian Lin 3 participants 3 messages Jan 2, 2023 – Apr 9, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: ux500: Fix refcount leak in ux500_pm_domains_init

of_irq_find_parent() returns a node pointer with refcount incremented, We should use of_node_put() on it when not needed anymore. Add missing of_node_put() in the error path to avoid refcount leak.

Fixes cd931dcfda5e ("ARM: ux500: Initial support for PM domains")
---
 arch/arm/mach-ux500/pm_domains.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-ux500/pm_domains.c +3 -1
index 427b9ac4af6c..01cae91854ca 100644
@@ -65,8 +65,10 @@ int __init ux500_pm_domains_init(void)
 		return -ENODEV;
 
 	genpd_data = kzalloc(sizeof(*genpd_data), GFP_KERNEL);
-	if (!genpd_data)
+	if (!genpd_data) {
+		of_node_put(np);
 		return -ENOMEM;
+	}
 
 	genpd_data->domains = ux500_pm_domains;
 	genpd_data->num_domains = ARRAY_SIZE(ux500_pm_domains);
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Miaoqian Lin

of_irq_find_parent() returns a node pointer with refcount incremented,

Probably a cut and paste, as you probably mean of_find_matching_node().

Quoted 5 lines

We should use of_node_put() on it when not needed anymore. Add missing of_node_put() in the error path to avoid refcount leak.

Fixes cd931dcfda5e ("ARM: ux500: Initial support for PM domains")

Other than the above, which maybe Linus can fixup when applying:

Kind regards
Uffe

Quoted 23 lines
---
 arch/arm/mach-ux500/pm_domains.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-ux500/pm_domains.c +3 -2
index 427b9ac4af6c..01cae91854ca 100644
@@ -65,8 +65,10 @@ int __init ux500_pm_domains_init(void)
                return -ENODEV;
 
        genpd_data = kzalloc(sizeof(*genpd_data), GFP_KERNEL);
-       if (!genpd_data)
+       if (!genpd_data) {
+               of_node_put(np);
                return -ENOMEM;
+       }
 
        genpd_data->domains = ux500_pm_domains;
        genpd_data->num_domains = ARRAY_SIZE(ux500_pm_domains);
--

2.25.1

#2 lore raw
In reply to Miaoqian Lin
Quoted 6 lines · Miaoqian Lin

of_irq_find_parent() returns a node pointer with refcount incremented, We should use of_node_put() on it when not needed anymore. Add missing of_node_put() in the error path to avoid refcount leak.

Fixes cd931dcfda5e ("ARM: ux500: Initial support for PM domains")

Patch applied. Sorry for forgetting about this patch!

Yours,
Linus Walleij