2023-01-02 10:27:52

by Miaoqian Lin

Subject: [PATCH] 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")
Signed-off-by: Miaoqian Lin <[email protected]>
---
arch/arm/mach-ux500/pm_domains.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-ux500/pm_domains.c b/arch/arm/mach-ux500/pm_domains.c
index 427b9ac4af6c..01cae91854ca 100644
--- a/arch/arm/mach-ux500/pm_domains.c
+++ b/arch/arm/mach-ux500/pm_domains.c
@@ -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

2023-01-02 16:42:27

by Ulf Hansson

Subject: Re: [PATCH] ARM: ux500: Fix refcount leak in ux500_pm_domains_init

On Mon, 2 Jan 2023 at 10:47, Miaoqian Lin <[email protected]> wrote:
>
> of_irq_find_parent() returns a node pointer with refcount incremented,

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

> 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")
> Signed-off-by: Miaoqian Lin <[email protected]>

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

Reviewed-by: Ulf Hansson <[email protected]>

Kind regards
Uffe

> ---
> arch/arm/mach-ux500/pm_domains.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-ux500/pm_domains.c b/arch/arm/mach-ux500/pm_domains.c
> index 427b9ac4af6c..01cae91854ca 100644
> --- a/arch/arm/mach-ux500/pm_domains.c
> +++ b/arch/arm/mach-ux500/pm_domains.c
> @@ -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
>

2023-04-09 21:40:33

by Linus Walleij

Subject: Re: [PATCH] ARM: ux500: Fix refcount leak in ux500_pm_domains_init

On Mon, Jan 2, 2023 at 10:47 AM Miaoqian Lin <[email protected]> wrote:

> 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")
> Signed-off-by: Miaoqian Lin <[email protected]>

Patch applied. Sorry for forgetting about this patch!

Yours,
Linus Walleij