linux-kernel - Re: [PATCH] arch: arm: mach-pxa: Add missing of_node

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 15 Jun 2022 11:49:40 +0200
From:   Daniel Mack <daniel@...que.org>
To:     heliang <windhl@....com>, haojian.zhuang@...il.com,
        robert.jarzmik@...e.fr, linux@...linux.org.uk
Cc:     linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] arch: arm: mach-pxa: Add missing of_node_put in irq.c

Hi,

On 6/15/22 11:12, heliang wrote:
> In pxa_dt_irq_init(), of_find_matching_node() will return a node
> pointer with refcount incremented. We should use of_node_put in
> fail path or when it is not used anymore.
> 
> Signed-off-by: heliang <windhl@....com>
> ---
>  arch/arm/mach-pxa/irq.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
> index 96f33ef1d9ea..a81e9ffb77af 100644
> --- a/arch/arm/mach-pxa/irq.c
> +++ b/arch/arm/mach-pxa/irq.c
> @@ -246,12 +246,14 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
>  	ret = of_property_read_u32(node, "marvell,intc-nr-irqs",
>  				   &pxa_internal_irq_nr);
>  	if (ret) {
> +		of_node_put(node);
>  		pr_err("Not found marvell,intc-nr-irqs property\n");
>  		return;

How about jumping to a label here instead of a plain "return"?

>  	}
>  
>  	ret = of_address_to_resource(node, 0, &res);
>  	if (ret < 0) {
> +		of_node_put(node);
>  		pr_err("No registers defined for node\n");
>  		return;

Same here.

>  	}
> @@ -262,10 +264,12 @@ void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int))
>  
>  	ret = irq_alloc_descs(-1, 0, pxa_internal_irq_nr, 0);
>  	if (ret < 0) {
> +		of_node_put(node);
>  		pr_err("Failed to allocate IRQ numbers\n");
>  		return;

And here.

>  	}
>  
>  	pxa_init_irq_common(node, pxa_internal_irq_nr, fn);

Jump target would go here.

> +	of_node_put(node);
>  }
>  #endif /* CONFIG_OF */