diff mbox

cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.

Message ID 1432519780-2910-1-git-send-email-shailendra.capricorn@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Shailendra Verma May 25, 2015, 2:09 a.m. UTC
During probe free the memory allocated to "exynos_info" in case of
unknown SOC type.

Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
---
 drivers/cpufreq/exynos-cpufreq.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Viresh Kumar May 25, 2015, 7:31 a.m. UTC | #1
On 25-05-15, 07:39, Shailendra Verma wrote:
> During probe free the memory allocated to "exynos_info" in case of
> unknown SOC type.
> 
> Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
> ---
>  drivers/cpufreq/exynos-cpufreq.c |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
> index 82d2fbb..8682378 100644
> --- a/drivers/cpufreq/exynos-cpufreq.c
> +++ b/drivers/cpufreq/exynos-cpufreq.c
> @@ -182,7 +182,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
>  		ret = exynos5250_cpufreq_init(exynos_info);
>  	} else {
>  		pr_err("%s: Unknown SoC type\n", __func__);
> -		return -ENODEV;
> +		ret = -ENODEV;
>  	}
>  
>  	if (ret)
> @@ -190,12 +190,14 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
>  
>  	if (exynos_info->set_freq == NULL) {
>  		dev_err(&pdev->dev, "No set_freq function (ERR)\n");
> +		ret = -EINVAL;
>  		goto err_vdd_arm;
>  	}
>  
>  	arm_regulator = regulator_get(NULL, "vdd_arm");
>  	if (IS_ERR(arm_regulator)) {
>  		dev_err(&pdev->dev, "failed to get resource vdd_arm\n");
> +		ret = -EINVAL;
>  		goto err_vdd_arm;
>  	}
>  
> @@ -227,7 +229,7 @@ err_cpufreq_reg:
>  	regulator_put(arm_regulator);
>  err_vdd_arm:
>  	kfree(exynos_info);
> -	return -EINVAL;
> +	return ret;
>  }
>  
>  static struct platform_driver exynos_cpufreq_platdrv = {

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Lukasz Majewski June 8, 2015, 8:31 a.m. UTC | #2
Hi Viresh,

> On 25-05-15, 07:39, Shailendra Verma wrote:
> > During probe free the memory allocated to "exynos_info" in case of
> > unknown SOC type.
> > 
> > Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
> > ---
> >  drivers/cpufreq/exynos-cpufreq.c |    6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/cpufreq/exynos-cpufreq.c
> > b/drivers/cpufreq/exynos-cpufreq.c index 82d2fbb..8682378 100644
> > --- a/drivers/cpufreq/exynos-cpufreq.c
> > +++ b/drivers/cpufreq/exynos-cpufreq.c
> > @@ -182,7 +182,7 @@ static int exynos_cpufreq_probe(struct
> > platform_device *pdev) ret = exynos5250_cpufreq_init(exynos_info);
> >  	} else {
> >  		pr_err("%s: Unknown SoC type\n", __func__);
> > -		return -ENODEV;
> > +		ret = -ENODEV;
> >  	}
> >  
> >  	if (ret)
> > @@ -190,12 +190,14 @@ static int exynos_cpufreq_probe(struct
> > platform_device *pdev) 
> >  	if (exynos_info->set_freq == NULL) {
> >  		dev_err(&pdev->dev, "No set_freq function
> > (ERR)\n");
> > +		ret = -EINVAL;
> >  		goto err_vdd_arm;
> >  	}
> >  
> >  	arm_regulator = regulator_get(NULL, "vdd_arm");
> >  	if (IS_ERR(arm_regulator)) {
> >  		dev_err(&pdev->dev, "failed to get resource
> > vdd_arm\n");
> > +		ret = -EINVAL;
> >  		goto err_vdd_arm;
> >  	}
> >  
> > @@ -227,7 +229,7 @@ err_cpufreq_reg:
> >  	regulator_put(arm_regulator);
> >  err_vdd_arm:
> >  	kfree(exynos_info);
> > -	return -EINVAL;
> > +	return ret;
> >  }
> >  
> >  static struct platform_driver exynos_cpufreq_platdrv = {
> 
> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> 

Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Rafael J. Wysocki June 8, 2015, 11:30 p.m. UTC | #3
On Monday, June 08, 2015 10:31:00 AM Lukasz Majewski wrote:
> Hi Viresh,
> 
> > On 25-05-15, 07:39, Shailendra Verma wrote:
> > > During probe free the memory allocated to "exynos_info" in case of
> > > unknown SOC type.
> > > 
> > > Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
> > > ---
> > >  drivers/cpufreq/exynos-cpufreq.c |    6 ++++--
> > >  1 file changed, 4 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/cpufreq/exynos-cpufreq.c
> > > b/drivers/cpufreq/exynos-cpufreq.c index 82d2fbb..8682378 100644
> > > --- a/drivers/cpufreq/exynos-cpufreq.c
> > > +++ b/drivers/cpufreq/exynos-cpufreq.c
> > > @@ -182,7 +182,7 @@ static int exynos_cpufreq_probe(struct
> > > platform_device *pdev) ret = exynos5250_cpufreq_init(exynos_info);
> > >  	} else {
> > >  		pr_err("%s: Unknown SoC type\n", __func__);
> > > -		return -ENODEV;
> > > +		ret = -ENODEV;
> > >  	}
> > >  
> > >  	if (ret)
> > > @@ -190,12 +190,14 @@ static int exynos_cpufreq_probe(struct
> > > platform_device *pdev) 
> > >  	if (exynos_info->set_freq == NULL) {
> > >  		dev_err(&pdev->dev, "No set_freq function
> > > (ERR)\n");
> > > +		ret = -EINVAL;
> > >  		goto err_vdd_arm;
> > >  	}
> > >  
> > >  	arm_regulator = regulator_get(NULL, "vdd_arm");
> > >  	if (IS_ERR(arm_regulator)) {
> > >  		dev_err(&pdev->dev, "failed to get resource
> > > vdd_arm\n");
> > > +		ret = -EINVAL;
> > >  		goto err_vdd_arm;
> > >  	}
> > >  
> > > @@ -227,7 +229,7 @@ err_cpufreq_reg:
> > >  	regulator_put(arm_regulator);
> > >  err_vdd_arm:
> > >  	kfree(exynos_info);
> > > -	return -EINVAL;
> > > +	return ret;
> > >  }
> > >  
> > >  static struct platform_driver exynos_cpufreq_platdrv = {
> > 
> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> > 
> 
> Acked-by: Lukasz Majewski <l.majewski@samsung.com>

I'm assuming that it will go it through the Samsung tree.
Lukasz Majewski June 9, 2015, 7:07 a.m. UTC | #4
Hi Rafael,

> On Monday, June 08, 2015 10:31:00 AM Lukasz Majewski wrote:
> > Hi Viresh,
> > 
> > > On 25-05-15, 07:39, Shailendra Verma wrote:
> > > > During probe free the memory allocated to "exynos_info" in case
> > > > of unknown SOC type.
> > > > 
> > > > Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
> > > > ---
> > > >  drivers/cpufreq/exynos-cpufreq.c |    6 ++++--
> > > >  1 file changed, 4 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/drivers/cpufreq/exynos-cpufreq.c
> > > > b/drivers/cpufreq/exynos-cpufreq.c index 82d2fbb..8682378 100644
> > > > --- a/drivers/cpufreq/exynos-cpufreq.c
> > > > +++ b/drivers/cpufreq/exynos-cpufreq.c
> > > > @@ -182,7 +182,7 @@ static int exynos_cpufreq_probe(struct
> > > > platform_device *pdev) ret =
> > > > exynos5250_cpufreq_init(exynos_info); } else {
> > > >  		pr_err("%s: Unknown SoC type\n", __func__);
> > > > -		return -ENODEV;
> > > > +		ret = -ENODEV;
> > > >  	}
> > > >  
> > > >  	if (ret)
> > > > @@ -190,12 +190,14 @@ static int exynos_cpufreq_probe(struct
> > > > platform_device *pdev) 
> > > >  	if (exynos_info->set_freq == NULL) {
> > > >  		dev_err(&pdev->dev, "No set_freq function
> > > > (ERR)\n");
> > > > +		ret = -EINVAL;
> > > >  		goto err_vdd_arm;
> > > >  	}
> > > >  
> > > >  	arm_regulator = regulator_get(NULL, "vdd_arm");
> > > >  	if (IS_ERR(arm_regulator)) {
> > > >  		dev_err(&pdev->dev, "failed to get resource
> > > > vdd_arm\n");
> > > > +		ret = -EINVAL;
> > > >  		goto err_vdd_arm;
> > > >  	}
> > > >  
> > > > @@ -227,7 +229,7 @@ err_cpufreq_reg:
> > > >  	regulator_put(arm_regulator);
> > > >  err_vdd_arm:
> > > >  	kfree(exynos_info);
> > > > -	return -EINVAL;
> > > > +	return ret;
> > > >  }
> > > >  
> > > >  static struct platform_driver exynos_cpufreq_platdrv = {
> > > 
> > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> > > 
> > 
> > Acked-by: Lukasz Majewski <l.majewski@samsung.com>
> 
> I'm assuming that it will go it through the Samsung tree.
> 
> 

That would be the easiest way to proceed. 

Krzystof would you like to grab this patch?
Krzysztof Kozlowski June 9, 2015, 7:23 a.m. UTC | #5
On 09.06.2015 16:07, Lukasz Majewski wrote:
> Hi Rafael,
> 
>> On Monday, June 08, 2015 10:31:00 AM Lukasz Majewski wrote:
>>> Hi Viresh,
>>>
>>>> On 25-05-15, 07:39, Shailendra Verma wrote:
>>>>> During probe free the memory allocated to "exynos_info" in case
>>>>> of unknown SOC type.
>>>>>
>>>>> Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
>>>>> ---
>>>>>  drivers/cpufreq/exynos-cpufreq.c |    6 ++++--
>>>>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/drivers/cpufreq/exynos-cpufreq.c
>>>>> b/drivers/cpufreq/exynos-cpufreq.c index 82d2fbb..8682378 100644
>>>>> --- a/drivers/cpufreq/exynos-cpufreq.c
>>>>> +++ b/drivers/cpufreq/exynos-cpufreq.c
>>>>> @@ -182,7 +182,7 @@ static int exynos_cpufreq_probe(struct
>>>>> platform_device *pdev) ret =
>>>>> exynos5250_cpufreq_init(exynos_info); } else {
>>>>>  		pr_err("%s: Unknown SoC type\n", __func__);
>>>>> -		return -ENODEV;
>>>>> +		ret = -ENODEV;
>>>>>  	}
>>>>>  
>>>>>  	if (ret)
>>>>> @@ -190,12 +190,14 @@ static int exynos_cpufreq_probe(struct
>>>>> platform_device *pdev) 
>>>>>  	if (exynos_info->set_freq == NULL) {
>>>>>  		dev_err(&pdev->dev, "No set_freq function
>>>>> (ERR)\n");
>>>>> +		ret = -EINVAL;
>>>>>  		goto err_vdd_arm;
>>>>>  	}
>>>>>  
>>>>>  	arm_regulator = regulator_get(NULL, "vdd_arm");
>>>>>  	if (IS_ERR(arm_regulator)) {
>>>>>  		dev_err(&pdev->dev, "failed to get resource
>>>>> vdd_arm\n");
>>>>> +		ret = -EINVAL;
>>>>>  		goto err_vdd_arm;
>>>>>  	}
>>>>>  
>>>>> @@ -227,7 +229,7 @@ err_cpufreq_reg:
>>>>>  	regulator_put(arm_regulator);
>>>>>  err_vdd_arm:
>>>>>  	kfree(exynos_info);
>>>>> -	return -EINVAL;
>>>>> +	return ret;
>>>>>  }
>>>>>  
>>>>>  static struct platform_driver exynos_cpufreq_platdrv = {
>>>>
>>>> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
>>>>
>>>
>>> Acked-by: Lukasz Majewski <l.majewski@samsung.com>
>>
>> I'm assuming that it will go it through the Samsung tree.
>>
>>
> 
> That would be the easiest way to proceed. 
> 
> Krzystof would you like to grab this patch?

Sure, I'll take it.

Best regards,
Krzysztof


--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 82d2fbb..8682378 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -182,7 +182,7 @@  static int exynos_cpufreq_probe(struct platform_device *pdev)
 		ret = exynos5250_cpufreq_init(exynos_info);
 	} else {
 		pr_err("%s: Unknown SoC type\n", __func__);
-		return -ENODEV;
+		ret = -ENODEV;
 	}
 
 	if (ret)
@@ -190,12 +190,14 @@  static int exynos_cpufreq_probe(struct platform_device *pdev)
 
 	if (exynos_info->set_freq == NULL) {
 		dev_err(&pdev->dev, "No set_freq function (ERR)\n");
+		ret = -EINVAL;
 		goto err_vdd_arm;
 	}
 
 	arm_regulator = regulator_get(NULL, "vdd_arm");
 	if (IS_ERR(arm_regulator)) {
 		dev_err(&pdev->dev, "failed to get resource vdd_arm\n");
+		ret = -EINVAL;
 		goto err_vdd_arm;
 	}
 
@@ -227,7 +229,7 @@  err_cpufreq_reg:
 	regulator_put(arm_regulator);
 err_vdd_arm:
 	kfree(exynos_info);
-	return -EINVAL;
+	return ret;
 }
 
 static struct platform_driver exynos_cpufreq_platdrv = {