2020-01-02 10:43:24

by Michał Mirosław

Subject: [PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure

sdhci_alloc_host() does its work not using managed infrastructure, so
needs explicit free on error path. Add it where needed.

Cc: <[email protected]>
Fixes: bb5f8ea4d514 ("mmc: sdhci-of-at91: introduce driver for the Atmel SDMMC")
Signed-off-by: Michał Mirosław <[email protected]>
---
drivers/mmc/host/sdhci-of-at91.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
index b2a8c45c9c23..ab2bd314a390 100644
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -345,20 +345,23 @@ static int sdhci_at91_probe(struct platform_device *pdev)
priv->mainck = NULL;
} else {
dev_err(&pdev->dev, "failed to get baseclk\n");
- return PTR_ERR(priv->mainck);
+ ret = PTR_ERR(priv->mainck);
+ goto sdhci_pltfm_free;
}
}

priv->hclock = devm_clk_get(&pdev->dev, "hclock");
if (IS_ERR(priv->hclock)) {
dev_err(&pdev->dev, "failed to get hclock\n");
- return PTR_ERR(priv->hclock);
+ ret = PTR_ERR(priv->hclock);
+ goto sdhci_pltfm_free;
}

priv->gck = devm_clk_get(&pdev->dev, "multclk");
if (IS_ERR(priv->gck)) {
dev_err(&pdev->dev, "failed to get multclk\n");
- return PTR_ERR(priv->gck);
+ ret = PTR_ERR(priv->gck);
+ goto sdhci_pltfm_free;
}

ret = sdhci_at91_set_clks_presets(&pdev->dev);
--
2.20.1

2020-01-09 07:21:18

by Ludovic Desroches

Subject: Re: [PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure

On Thu, Jan 02, 2020 at 11:42:16AM +0100, Michał Mirosław wrote:
> sdhci_alloc_host() does its work not using managed infrastructure, so
> needs explicit free on error path. Add it where needed.
>
> Cc: <[email protected]>
> Fixes: bb5f8ea4d514 ("mmc: sdhci-of-at91: introduce driver for the Atmel SDMMC")
> Signed-off-by: Michał Mirosław <[email protected]>

Acked-by: Ludovic Desroches <[email protected]>

Thanks

> ---
> drivers/mmc/host/sdhci-of-at91.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
> index b2a8c45c9c23..ab2bd314a390 100644
> --- a/drivers/mmc/host/sdhci-of-at91.c
> +++ b/drivers/mmc/host/sdhci-of-at91.c
> @@ -345,20 +345,23 @@ static int sdhci_at91_probe(struct platform_device *pdev)
> priv->mainck = NULL;
> } else {
> dev_err(&pdev->dev, "failed to get baseclk\n");
> - return PTR_ERR(priv->mainck);
> + ret = PTR_ERR(priv->mainck);
> + goto sdhci_pltfm_free;
> }
> }
>
> priv->hclock = devm_clk_get(&pdev->dev, "hclock");
> if (IS_ERR(priv->hclock)) {
> dev_err(&pdev->dev, "failed to get hclock\n");
> - return PTR_ERR(priv->hclock);
> + ret = PTR_ERR(priv->hclock);
> + goto sdhci_pltfm_free;
> }
>
> priv->gck = devm_clk_get(&pdev->dev, "multclk");
> if (IS_ERR(priv->gck)) {
> dev_err(&pdev->dev, "failed to get multclk\n");
> - return PTR_ERR(priv->gck);
> + ret = PTR_ERR(priv->gck);
> + goto sdhci_pltfm_free;
> }
>
> ret = sdhci_at91_set_clks_presets(&pdev->dev);
> --
> 2.20.1
>

2020-01-14 12:13:02

by Adrian Hunter

Subject: Re: [PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure

On 2/01/20 12:42 pm, Michał Mirosław wrote:
> sdhci_alloc_host() does its work not using managed infrastructure, so
> needs explicit free on error path. Add it where needed.
>
> Cc: <[email protected]>
> Fixes: bb5f8ea4d514 ("mmc: sdhci-of-at91: introduce driver for the Atmel SDMMC")
> Signed-off-by: Michał Mirosław <[email protected]>

Acked-by: Adrian Hunter <[email protected]>

> ---
> drivers/mmc/host/sdhci-of-at91.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
> index b2a8c45c9c23..ab2bd314a390 100644
> --- a/drivers/mmc/host/sdhci-of-at91.c
> +++ b/drivers/mmc/host/sdhci-of-at91.c
> @@ -345,20 +345,23 @@ static int sdhci_at91_probe(struct platform_device *pdev)
> priv->mainck = NULL;
> } else {
> dev_err(&pdev->dev, "failed to get baseclk\n");
> - return PTR_ERR(priv->mainck);
> + ret = PTR_ERR(priv->mainck);
> + goto sdhci_pltfm_free;
> }
> }
>
> priv->hclock = devm_clk_get(&pdev->dev, "hclock");
> if (IS_ERR(priv->hclock)) {
> dev_err(&pdev->dev, "failed to get hclock\n");
> - return PTR_ERR(priv->hclock);
> + ret = PTR_ERR(priv->hclock);
> + goto sdhci_pltfm_free;
> }
>
> priv->gck = devm_clk_get(&pdev->dev, "multclk");
> if (IS_ERR(priv->gck)) {
> dev_err(&pdev->dev, "failed to get multclk\n");
> - return PTR_ERR(priv->gck);
> + ret = PTR_ERR(priv->gck);
> + goto sdhci_pltfm_free;
> }
>
> ret = sdhci_at91_set_clks_presets(&pdev->dev);
>

2020-01-16 14:41:43

by Ulf Hansson

Subject: Re: [PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure

On Thu, 2 Jan 2020 at 11:42, Michał Mirosław <[email protected]> wrote:
>
> sdhci_alloc_host() does its work not using managed infrastructure, so
> needs explicit free on error path. Add it where needed.
>
> Cc: <[email protected]>
> Fixes: bb5f8ea4d514 ("mmc: sdhci-of-at91: introduce driver for the Atmel SDMMC")
> Signed-off-by: Michał Mirosław <[email protected]>

Applied for next, thanks!

Kind regards
Uffe



> ---
> drivers/mmc/host/sdhci-of-at91.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
> index b2a8c45c9c23..ab2bd314a390 100644
> --- a/drivers/mmc/host/sdhci-of-at91.c
> +++ b/drivers/mmc/host/sdhci-of-at91.c
> @@ -345,20 +345,23 @@ static int sdhci_at91_probe(struct platform_device *pdev)
> priv->mainck = NULL;
> } else {
> dev_err(&pdev->dev, "failed to get baseclk\n");
> - return PTR_ERR(priv->mainck);
> + ret = PTR_ERR(priv->mainck);
> + goto sdhci_pltfm_free;
> }
> }
>
> priv->hclock = devm_clk_get(&pdev->dev, "hclock");
> if (IS_ERR(priv->hclock)) {
> dev_err(&pdev->dev, "failed to get hclock\n");
> - return PTR_ERR(priv->hclock);
> + ret = PTR_ERR(priv->hclock);
> + goto sdhci_pltfm_free;
> }
>
> priv->gck = devm_clk_get(&pdev->dev, "multclk");
> if (IS_ERR(priv->gck)) {
> dev_err(&pdev->dev, "failed to get multclk\n");
> - return PTR_ERR(priv->gck);
> + ret = PTR_ERR(priv->gck);
> + goto sdhci_pltfm_free;
> }
>
> ret = sdhci_at91_set_clks_presets(&pdev->dev);
> --
> 2.20.1
>