2022-12-29 06:07:54

by Miaoqian Lin

Subject: [PATCH] EDAC: highbank: Fix memory leak in highbank_mc_probe

edac_mc_alloc() allocates memory. The memory are not released
when devres_open_group() fails, which causes memory leak.
Call edac_mc_free() in the error handling to fix this.

Fixes: a1b01edb2745 ("edac: add support for Calxeda highbank memory controller")
Signed-off-by: Miaoqian Lin <[email protected]>
---
altr_sdram_probe() performs similar operations,
I take it as reference.
---
drivers/edac/highbank_mc_edac.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c
index 61b76ec226af..19fba258ae10 100644
--- a/drivers/edac/highbank_mc_edac.c
+++ b/drivers/edac/highbank_mc_edac.c
@@ -174,8 +174,10 @@ static int highbank_mc_probe(struct platform_device *pdev)
drvdata = mci->pvt_info;
platform_set_drvdata(pdev, mci);

- if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL))
- return -ENOMEM;
+ if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL)) {
+ res = -ENOMEM;
+ goto free;
+ }

r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!r) {
@@ -243,6 +245,7 @@ static int highbank_mc_probe(struct platform_device *pdev)
edac_mc_del_mc(&pdev->dev);
err:
devres_release_group(&pdev->dev, NULL);
+free:
edac_mc_free(mci);
return res;
}
--
2.25.1

2023-01-03 13:13:50

by Andre Przywara

Subject: Re: [PATCH] EDAC: highbank: Fix memory leak in highbank_mc_probe

On Thu, 29 Dec 2022 09:48:24 +0400
Miaoqian Lin <[email protected]> wrote:

Hi,

> edac_mc_alloc() allocates memory. The memory are not released
> when devres_open_group() fails, which causes memory leak.
> Call edac_mc_free() in the error handling to fix this.

Yes, this looks correct.

Reviewed-by: Andre Przywara <[email protected]>

Cheers,
Andre

> Fixes: a1b01edb2745 ("edac: add support for Calxeda highbank memory controller")
> Signed-off-by: Miaoqian Lin <[email protected]>
> ---
> altr_sdram_probe() performs similar operations,
> I take it as reference.
> ---
> drivers/edac/highbank_mc_edac.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c
> index 61b76ec226af..19fba258ae10 100644
> --- a/drivers/edac/highbank_mc_edac.c
> +++ b/drivers/edac/highbank_mc_edac.c
> @@ -174,8 +174,10 @@ static int highbank_mc_probe(struct platform_device *pdev)
> drvdata = mci->pvt_info;
> platform_set_drvdata(pdev, mci);
>
> - if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL))
> - return -ENOMEM;
> + if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL)) {
> + res = -ENOMEM;
> + goto free;
> + }
>
> r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!r) {
> @@ -243,6 +245,7 @@ static int highbank_mc_probe(struct platform_device *pdev)
> edac_mc_del_mc(&pdev->dev);
> err:
> devres_release_group(&pdev->dev, NULL);
> +free:
> edac_mc_free(mci);
> return res;
> }

2023-01-03 17:17:38

by Borislav Petkov

Subject: Re: [PATCH] EDAC: highbank: Fix memory leak in highbank_mc_probe

On Thu, Dec 29, 2022 at 09:48:24AM +0400, Miaoqian Lin wrote:
> edac_mc_alloc() allocates memory. The memory are not released
> when devres_open_group() fails, which causes memory leak.
> Call edac_mc_free() in the error handling to fix this.
>
> Fixes: a1b01edb2745 ("edac: add support for Calxeda highbank memory controller")
> Signed-off-by: Miaoqian Lin <[email protected]>
> ---
> altr_sdram_probe() performs similar operations,
> I take it as reference.
> ---
> drivers/edac/highbank_mc_edac.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)

Applied, thanks.

--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette