Skip to contentSkip to conversation

FAILED: patch "[PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure" failed to apply to 5.5-stable tree

PATCH [email protected] 3 participants 3 messages Feb 6, 2020 – Feb 11, 2020

Subsystems (5)
Stable branch MMC, SD and SDIO Arm/Microchip (AT91) SoC support Secure digital host controller interface (SDHCI) driver +1 more subsystems
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From a04184ce777b46e92c2b3c93c6dcb2754cb005e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <[email protected]>
Date: Thu, 2 Jan 2020 11:42:16 +0100
Subject: [PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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]>
Acked-by Adrian Hunter <[email protected]>
Link https://lore.kernel.org/r/b2a44d5be2e06ff075f32477e466598bb0f07b36.1577961679.git.mirq-linux@rere.qmqm.pl open here
Signed-off-by Ulf Hansson <[email protected]>
drivers/mmc/host/sdhci-of-at91.c +6 -3
index b2a8c45c9c23..ab2bd314a390 100644
@@ -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);
maintainer
#1 lore raw
Quoted 23 lines · On Thu, Feb 06, 2020 at 08:08:47PM +0100, [email protected] wrote:

The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From a04184ce777b46e92c2b3c93c6dcb2754cb005e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <[email protected]>
Date: Thu, 2 Jan 2020 11:42:16 +0100
Subject: [PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Quoted 7 lines
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]>
Acked-by Adrian Hunter <[email protected]>
Link https://lore.kernel.org/r/b2a44d5be2e06ff075f32477e466598bb0f07b36.1577961679.git.mirq-linux@rere.qmqm.pl open here
Signed-off-by Ulf Hansson <[email protected]>

We're missing 3976656d67c1 ("mmc: sdhci-of-at91: rework clocks management to support SAM9x60 device") on older kernels. I've fixed it up and queued for 5.5-4.14. I don't think it applies to older kernels, but happy to be proven otherwise.

Signature · 2 lines
Thanks,
Sasha
#2 lore raw
Quoted 34 lines · Sasha Levin

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

Quoted 23 lines · On Thu, Feb 06, 2020 at 08:08:47PM +0100, [email protected] wrote:

The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From a04184ce777b46e92c2b3c93c6dcb2754cb005e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <[email protected]>
Date: Thu, 2 Jan 2020 11:42:16 +0100
Subject: [PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Quoted 7 lines
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]>
Acked-by Adrian Hunter <[email protected]>
Link https://lore.kernel.org/r/b2a44d5be2e06ff075f32477e466598bb0f07b36.1577961679.git.mirq-linux@rere.qmqm.pl open here
Signed-off-by Ulf Hansson <[email protected]>
Quoted 4 lines

We're missing 3976656d67c1 ("mmc: sdhci-of-at91: rework clocks management to support SAM9x60 device") on older kernels. I've fixed it up and queued for 5.5-4.14. I don't think it applies to older kernels, but happy to be proven otherwise.

Thanks Sasha for taking care of this.

Regards

Ludovic

Quoted 4 lines

--
Thanks,
Sasha