Re: [PATCH 2/4] ARM: mvebu: fix a leaked reference by adding missing of_node_put

[Gregory CLEMENT]

Hi Wen Yang,

> 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-mvebu/pm-board.c:135:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 88, but without a corresponding object release within this functio
>
> Signed-off-by: Wen Yang <wen.yang99@xxxxxxxxxx>
> Cc: Jason Cooper <jason@xxxxxxxxxxxxxx>
> Cc: Andrew Lunn <andrew@xxxxxxx>
> Cc: Gregory Clement <gregory.clement@xxxxxxxxxxx>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx>
> Cc: Russell King <linux@xxxxxxxxxxxxxxx>
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx

Applied on mvebu/arm

Thanks,

Gregory

> ---
>  arch/arm/mach-mvebu/pm-board.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-mvebu/pm-board.c b/arch/arm/mach-mvebu/pm-board.c
> index db17121..1e2c17c 100644
> --- a/arch/arm/mach-mvebu/pm-board.c
> +++ b/arch/arm/mach-mvebu/pm-board.c
> @@ -79,7 +79,7 @@ static void mvebu_armada_pm_enter(void __iomem *sdram_reg, u32 srcmd)
>  static int __init mvebu_armada_pm_init(void)
>  {
>  	struct device_node *np;
> -	struct device_node *gpio_ctrl_np;
> +	struct device_node *gpio_ctrl_np = NULL;
>  	int ret = 0, i;
>  
>  	if (!of_machine_is_compatible("marvell,axp-gp"))
> @@ -126,18 +126,23 @@ static int __init mvebu_armada_pm_init(void)
>  			goto out;
>  		}
>  
> +		if(gpio_ctrl_np)
> +			of_node_put(gpio_ctrl_np);
>  		gpio_ctrl_np = args.np;
>  		pic_raw_gpios[i] = args.args[0];
>  	}
>  
>  	gpio_ctrl = of_iomap(gpio_ctrl_np, 0);
> -	if (!gpio_ctrl)
> -		return -ENOMEM;
> +	if (!gpio_ctrl) {
> +		ret = -ENOMEM;
> +		goto out;
> +	}
>  
>  	mvebu_pm_suspend_init(mvebu_armada_pm_enter);
>  
>  out:
>  	of_node_put(np);
> +	of_node_put(gpio_ctrl_np);
>  	return ret;
>  }
>  
> -- 
> 2.9.5
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com