From: Sasha Levin Date: Fri, 7 Feb 2020 02:08:03 +0000 (-0500) Subject: fixes for 5.5 X-Git-Tag: v4.19.103~112 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98209568d35c7d75cee747518c7d0906d9e3ac46;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 5.5 Signed-off-by: Sasha Levin --- diff --git a/queue-5.5/mmc-sdhci-of-at91-fix-memleak-on-clk_get-failure.patch b/queue-5.5/mmc-sdhci-of-at91-fix-memleak-on-clk_get-failure.patch new file mode 100644 index 00000000000..e7f9eed47a1 --- /dev/null +++ b/queue-5.5/mmc-sdhci-of-at91-fix-memleak-on-clk_get-failure.patch @@ -0,0 +1,60 @@ +From 0cf362d7d0184eebf756ac9adbab0b969882729e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 Jan 2020 11:42:16 +0100 +Subject: 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 + +From: Michał Mirosław + +[ Upstream commit a04184ce777b46e92c2b3c93c6dcb2754cb005e1 ] + +sdhci_alloc_host() does its work not using managed infrastructure, so +needs explicit free on error path. Add it where needed. + +Cc: +Fixes: bb5f8ea4d514 ("mmc: sdhci-of-at91: introduce driver for the Atmel SDMMC") +Signed-off-by: Michał Mirosław +Acked-by: Ludovic Desroches +Acked-by: Adrian Hunter +Link: https://lore.kernel.org/r/b2a44d5be2e06ff075f32477e466598bb0f07b36.1577961679.git.mirq-linux@rere.qmqm.pl +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + 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 5959e394b416f..99d82c1874d62 100644 +--- a/drivers/mmc/host/sdhci-of-at91.c ++++ b/drivers/mmc/host/sdhci-of-at91.c +@@ -335,19 +335,22 @@ static int sdhci_at91_probe(struct platform_device *pdev) + priv->mainck = devm_clk_get(&pdev->dev, "baseclk"); + if (IS_ERR(priv->mainck)) { + 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 + diff --git a/queue-5.5/series b/queue-5.5/series index 152dae04960..42bf46ccb91 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -103,3 +103,4 @@ ubifs-don-t-trigger-assertion-on-invalid-no-key-filename.patch ubifs-fix-wrong-memory-allocation.patch ubifs-fix-fs_ioc_setflags-unexpectedly-clearing-encrypt-flag.patch ubifs-fix-deadlock-in-concurrent-bulk-read-and-writepage.patch +mmc-sdhci-of-at91-fix-memleak-on-clk_get-failure.patch