2015-05-25 02:10:07

by Shailendra Verma

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

During probe free the memory allocated to "exynos_info" in case of
unknown SOC type.

Signed-off-by: Shailendra Verma <[email protected]>
---
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

2015-05-25 07:31:57

by Viresh Kumar

Subject: Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.

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 <[email protected]>
> ---
> 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 <[email protected]>

--
viresh

2015-06-08 08:31:17

by Lukasz Majewski

Subject: Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.

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 <[email protected]>
> > ---
> > 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 <[email protected]>
>

Acked-by: Lukasz Majewski <[email protected]>

--
Best regards,

Lukasz Majewski

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

2015-06-08 23:04:56

by Rafael J. Wysocki

Subject: Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.

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 <[email protected]>
> > > ---
> > > 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 <[email protected]>
> >
>
> Acked-by: Lukasz Majewski <[email protected]>

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.

2015-06-09 07:08:09

by Lukasz Majewski

Subject: Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.

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 <[email protected]>
> > > > ---
> > > > 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 <[email protected]>
> > >
> >
> > Acked-by: Lukasz Majewski <[email protected]>
>
> 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

2015-06-09 07:23:37

by Krzysztof Kozlowski

Subject: Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.

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 <[email protected]>
>>>>> ---
>>>>> 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 <[email protected]>
>>>>
>>>
>>> Acked-by: Lukasz Majewski <[email protected]>
>>
>> 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