linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
@ 2015-05-25  2:09 Shailendra Verma
  2015-05-25  7:31 ` Viresh Kumar
  0 siblings, 1 reply; 10+ messages in thread
From: Shailendra Verma @ 2015-05-25  2:09 UTC (permalink / raw)
  To: Rafael J. Wysocki, Viresh Kumar, Kukjin Kim, Krzysztof Kozlowski,
	linux-pm, linux-arm-kernel, linux-samsung-soc
  Cc: linux-kernel, Shailendra Verma

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 = {
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
  2015-05-25  2:09 [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match Shailendra Verma
@ 2015-05-25  7:31 ` Viresh Kumar
  2015-06-08  8:31   ` Lukasz Majewski
  0 siblings, 1 reply; 10+ messages in thread
From: Viresh Kumar @ 2015-05-25  7:31 UTC (permalink / raw)
  To: Shailendra Verma
  Cc: Rafael J. Wysocki, Kukjin Kim, Krzysztof Kozlowski, linux-pm,
	linux-arm-kernel, linux-samsung-soc, linux-kernel

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>

-- 
viresh

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
  2015-05-25  7:31 ` Viresh Kumar
@ 2015-06-08  8:31   ` Lukasz Majewski
  2015-06-08 23:30     ` Rafael J. Wysocki
  0 siblings, 1 reply; 10+ messages in thread
From: Lukasz Majewski @ 2015-06-08  8:31 UTC (permalink / raw)
  To: Shailendra Verma
  Cc: Viresh Kumar, Rafael J. Wysocki, Kukjin Kim, Krzysztof Kozlowski,
	linux-pm, linux-arm-kernel, linux-samsung-soc, linux-kernel

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>

-- 
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
  2015-06-08  8:31   ` Lukasz Majewski
@ 2015-06-08 23:30     ` Rafael J. Wysocki
  2015-06-09  7:07       ` Lukasz Majewski
  0 siblings, 1 reply; 10+ messages in thread
From: Rafael J. Wysocki @ 2015-06-08 23:30 UTC (permalink / raw)
  To: Lukasz Majewski
  Cc: Shailendra Verma, Viresh Kumar, Kukjin Kim, Krzysztof Kozlowski,
	linux-pm, linux-arm-kernel, linux-samsung-soc, linux-kernel

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.


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
  2015-06-08 23:30     ` Rafael J. Wysocki
@ 2015-06-09  7:07       ` Lukasz Majewski
  2015-06-09  7:23         ` Krzysztof Kozlowski
  0 siblings, 1 reply; 10+ messages in thread
From: Lukasz Majewski @ 2015-06-09  7:07 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Krzysztof Kozlowski, linux-samsung-soc, linux-pm, Viresh Kumar,
	linux-kernel, Kukjin Kim, Shailendra Verma, linux-arm-kernel

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?

-- 
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
  2015-06-09  7:07       ` Lukasz Majewski
@ 2015-06-09  7:23         ` Krzysztof Kozlowski
  0 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2015-06-09  7:23 UTC (permalink / raw)
  To: Lukasz Majewski, Rafael J. Wysocki
  Cc: linux-samsung-soc, linux-pm, Viresh Kumar, linux-kernel,
	Kukjin Kim, Shailendra Verma, linux-arm-kernel

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



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
  2015-05-23  3:02 Shailendra Verma
@ 2015-05-23  4:42 ` Viresh Kumar
  0 siblings, 0 replies; 10+ messages in thread
From: Viresh Kumar @ 2015-05-23  4:42 UTC (permalink / raw)
  To: Shailendra Verma
  Cc: Rafael J. Wysocki, Kukjin Kim, Krzysztof Kozlowski, linux-pm,
	linux-arm-kernel, linux-samsung-soc, linux-kernel

On 23-05-15, 08:32, 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 |   15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
> index 82d2fbb..5b57a0f 100644
> --- a/drivers/cpufreq/exynos-cpufreq.c
> +++ b/drivers/cpufreq/exynos-cpufreq.c
> @@ -182,20 +182,25 @@ 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;
> +		goto err_vdd_arm;

Because we are going to check ret again, don't add the goto here. The
below code will take care of this.

>  	}
>  
> -	if (ret)
> +	if (ret) {
> +		ret = -EINVAL;

Why update ret here ?

>  		goto err_vdd_arm;
> +	}
>  
>  	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;
>  	}
>  
> @@ -203,8 +208,10 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
>  	locking_frequency = clk_get_rate(exynos_info->cpu_clk) / 1000;
>  
>  	ret = cpufreq_register_driver(&exynos_driver);
> -	if (ret)
> +	if (ret) {
> +		ret = -EINVAL;

Wrong again.

>  		goto err_cpufreq_reg;
> +	}
>  
>  	cpu0 = of_get_cpu_node(0, NULL);
>  	if (!cpu0) {
> @@ -227,7 +234,7 @@ err_cpufreq_reg:
>  	regulator_put(arm_regulator);
>  err_vdd_arm:
>  	kfree(exynos_info);
> -	return -EINVAL;
> +	return ret;
>  }

-- 
viresh

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
@ 2015-05-23  3:02 Shailendra Verma
  2015-05-23  4:42 ` Viresh Kumar
  0 siblings, 1 reply; 10+ messages in thread
From: Shailendra Verma @ 2015-05-23  3:02 UTC (permalink / raw)
  To: Rafael J. Wysocki, Viresh Kumar, Kukjin Kim, Krzysztof Kozlowski,
	linux-pm, linux-arm-kernel, linux-samsung-soc
  Cc: linux-kernel, Shailendra Verma

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 |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 82d2fbb..5b57a0f 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -182,20 +182,25 @@ 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;
+		goto err_vdd_arm;
 	}
 
-	if (ret)
+	if (ret) {
+		ret = -EINVAL;
 		goto err_vdd_arm;
+	}
 
 	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;
 	}
 
@@ -203,8 +208,10 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
 	locking_frequency = clk_get_rate(exynos_info->cpu_clk) / 1000;
 
 	ret = cpufreq_register_driver(&exynos_driver);
-	if (ret)
+	if (ret) {
+		ret = -EINVAL;
 		goto err_cpufreq_reg;
+	}
 
 	cpu0 = of_get_cpu_node(0, NULL);
 	if (!cpu0) {
@@ -227,7 +234,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 = {
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
  2015-05-21 18:29 Shailendra Verma
@ 2015-05-22  2:17 ` Viresh Kumar
  0 siblings, 0 replies; 10+ messages in thread
From: Viresh Kumar @ 2015-05-22  2:17 UTC (permalink / raw)
  To: Shailendra Verma
  Cc: Rafael J. Wysocki, Kukjin Kim, Krzysztof Kozlowski, linux-pm,
	linux-arm-kernel, linux-samsung-soc, linux-kernel

On 21-05-15, 23:59, 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 |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
> index 82d2fbb..b77923a 100644
> --- a/drivers/cpufreq/exynos-cpufreq.c
> +++ b/drivers/cpufreq/exynos-cpufreq.c
> @@ -182,6 +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__);
> +		kfree(exynos_info);
>  		return -ENODEV;
>  	}

There is no point replicating this stuff. Use labels like: err_vdd_arm
to get this done. But you also need to make sure the right error gets
propagated.

-- 
viresh

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
@ 2015-05-21 18:29 Shailendra Verma
  2015-05-22  2:17 ` Viresh Kumar
  0 siblings, 1 reply; 10+ messages in thread
From: Shailendra Verma @ 2015-05-21 18:29 UTC (permalink / raw)
  To: Rafael J. Wysocki, Viresh Kumar, Kukjin Kim, Krzysztof Kozlowski,
	linux-pm, linux-arm-kernel, linux-samsung-soc
  Cc: linux-kernel, Shailendra Verma

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 |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 82d2fbb..b77923a 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -182,6 +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__);
+		kfree(exynos_info);
 		return -ENODEV;
 	}
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-06-09  7:23 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-25  2:09 [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match Shailendra Verma
2015-05-25  7:31 ` Viresh Kumar
2015-06-08  8:31   ` Lukasz Majewski
2015-06-08 23:30     ` Rafael J. Wysocki
2015-06-09  7:07       ` Lukasz Majewski
2015-06-09  7:23         ` Krzysztof Kozlowski
  -- strict thread matches above, loose matches on Subject: below --
2015-05-23  3:02 Shailendra Verma
2015-05-23  4:42 ` Viresh Kumar
2015-05-21 18:29 Shailendra Verma
2015-05-22  2:17 ` Viresh Kumar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).