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
> ---
> 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
>>>
>>> Acked-by: Lukasz Majewski
>>
>> 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-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
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
> > > > ---
> > > > 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
> > >
> >
> > Acked-by: Lukasz Majewski
>
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
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
> > > ---
> > > 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
> >
>
> Acked-by: Lukasz Majewski
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
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
> > ---
> > 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
>
Acked-by: Lukasz Majewski
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
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
> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[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
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
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
> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[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
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
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
> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[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
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
