linux-kernel - Re: [PATCH v1] clocksource/timer-atmel-pit:- Fix resource leaks in error paths.

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] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 18 May 2017 11:26:36 +0200
From:   Alexandre Belloni <alexandre.belloni@...e-electrons.com>
To:     Arvind Yadav <arvind.yadav.cs@...il.com>
Cc:     nicolas.ferre@...el.com, tglx@...utronix.de,
        daniel.lezcano@...aro.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v1] clocksource/timer-atmel-pit:- Fix resource leaks in
 error paths.

Hi,

This needs a proper commit message. Also, can you tell us on which SoC
you tested your changes?

On 05/05/2017 at 18:21:48 +0530, Arvind Yadav wrote:
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@...il.com>
> ---
>  drivers/clocksource/timer-atmel-pit.c | 30 +++++++++++++++++++++++-------
>  1 file changed, 23 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
> index c0b5df3..28b0cd3 100644
> --- a/drivers/clocksource/timer-atmel-pit.c
> +++ b/drivers/clocksource/timer-atmel-pit.c
> @@ -180,26 +180,29 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
>  	data->base = of_iomap(node, 0);
>  	if (!data->base) {
>  		pr_err("Could not map PIT address\n");
> -		return -ENXIO;
> +		ret = -ENXIO;
> +		goto error_free;
>  	}
>  
>  	data->mck = of_clk_get(node, 0);
>  	if (IS_ERR(data->mck)) {
>  		pr_err("Unable to get mck clk\n");
> -		return PTR_ERR(data->mck);
> +		ret = PTR_ERR(data->mck);
> +		goto error_iounmap;
>  	}
>  
>  	ret = clk_prepare_enable(data->mck);
>  	if (ret) {
>  		pr_err("Unable to enable mck\n");
> -		return ret;
> +		goto error_clk_put;
>  	}
>  
>  	/* Get the interrupts property */
>  	data->irq = irq_of_parse_and_map(node, 0);
>  	if (!data->irq) {
>  		pr_err("Unable to get IRQ from DT\n");
> -		return -EINVAL;
> +		ret = -EINVAL;
> +		goto error_clk_disable;
>  	}
>  
>  	/*
> @@ -223,11 +226,11 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
>  	data->clksrc.rating = 175;
>  	data->clksrc.read = read_pit_clk;
>  	data->clksrc.flags = CLOCK_SOURCE_IS_CONTINUOUS;
> -	
> +
>  	ret = clocksource_register_hz(&data->clksrc, pit_rate);
>  	if (ret) {
>  		pr_err("Failed to register clocksource");
> -		return ret;
> +		goto error_clk_disable;
>  	}
>  
>  	/* Set up irq handler */
> @@ -236,7 +239,7 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
>  			  "at91_tick", data);
>  	if (ret) {
>  		pr_err("Unable to setup IRQ\n");
> -		return ret;
> +		goto error_unregister_clk;
>  	}
>  
>  	/* Set up and register clockevents */
> @@ -254,6 +257,19 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
>  	clockevents_register_device(&data->clkevt);
>  
>  	return 0;
> +
> +error_unregister_clk:
> +	clocksource_unregister(&data->clksrc);
> +error_clk_disable:
> +	clk_disable_unprepare(data->mck);
> +error_clk_put:
> +	clk_put(data->mck);
> +error_iounmap:
> +	iounmap(data->base);
> +error_free:
> +	kfree(data);
> +
> +	return ret;
>  }
>  CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
>  		       at91sam926x_pit_dt_init);
> -- 
> 1.9.1
> 
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com