Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1644011 > unrolled thread

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

Started byAlexandre Belloni <alexandre.belloni@free-electrons.com>
First post2017-05-18 11:30 +0200
Last post2017-05-18 13:40 +0200
Articles 3 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [PATCH v1] clocksource/timer-atmel-pit:- Fix resource leaks in  error paths. Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-05-18 11:30 +0200
    Re: [PATCH v1] clocksource/timer-atmel-pit:- Fix resource leaks in  error paths. Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-05-18 12:40 +0200
      Re: [PATCH v1] clocksource/timer-atmel-pit:- Fix resource leaks in  error paths. Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-05-18 13:40 +0200

#1644011 — Re: [PATCH v1] clocksource/timer-atmel-pit:- Fix resource leaks in error paths.

FromAlexandre Belloni <alexandre.belloni@free-electrons.com>
Date2017-05-18 11:30 +0200
SubjectRe: [PATCH v1] clocksource/timer-atmel-pit:- Fix resource leaks in error paths.
Message-ID<tIpUR-8mm-13@gated-at.bofh.it>
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@gmail.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

[toc] | [next] | [standalone]

#1644059

FromArvind Yadav <arvind.yadav.cs@gmail.com>
Date2017-05-18 12:40 +0200
Message-ID<tIr0B-147-1@gated-at.bofh.it>
In reply to#1644011
Hi,
Yes i have tested on board SBC6045 with Atmel SoC.

Commit message  " Handle return error in at91sam926x_pit_dt_init.
at91sam926x_pit_dt_init can fail here. We must have released memory
and clock "

is this fine?

Regards
-Arvind

On Thursday 18 May 2017 02:56 PM, Alexandre Belloni wrote:
> 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@gmail.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
>>
>>

[toc] | [prev] | [next] | [standalone]

#1644294

FromAlexandre Belloni <alexandre.belloni@free-electrons.com>
Date2017-05-18 13:40 +0200
Message-ID<tIrWH-1NJ-35@gated-at.bofh.it>
In reply to#1644059
On 18/05/2017 at 16:03:48 +0530, Arvind Yadav wrote:
> Hi,
> Yes i have tested on board SBC6045 with Atmel SoC.
> 

Ok, thanks.

> Commit message  " Handle return error in at91sam926x_pit_dt_init.
> at91sam926x_pit_dt_init can fail here. We must have released memory
> and clock "
> 
> is this fine?
> 

Sure.

My point is that currently, if any of it fails, your board will not boot
anyway ;).

> Regards
> -Arvind
> 
> On Thursday 18 May 2017 02:56 PM, Alexandre Belloni wrote:
> > 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@gmail.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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web