Skip to content

Commit

Permalink
mmc: wmt-sdmmc: fix return value check of mmc_add_host()
Browse files Browse the repository at this point in the history
mmc_add_host() may return error, if we ignore its return value, the memory
that allocated in mmc_alloc_host() will be leaked and it will lead a kernel
crash because of deleting not added device in the remove path.

So fix this by checking the return value and goto error path which will call
mmc_free_host(), besides, clk_disable_unprepare() also needs be called.

Fixes: 3a96dff ("mmc: SD/MMC Host Controller for Wondermedia WM8505/WM8650")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20221101063023.1664968-10-yangyingliang@huawei.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
Yang Yingliang authored and Ulf Hansson committed Dec 7, 2022
1 parent 0613ad2 commit 29276d5
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/mmc/host/wmt-sdmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -856,11 +856,15 @@ static int wmt_mci_probe(struct platform_device *pdev)
/* configure the controller to a known 'ready' state */
wmt_reset_hardware(mmc);

mmc_add_host(mmc);
ret = mmc_add_host(mmc);
if (ret)
goto fail7;

dev_info(&pdev->dev, "WMT SDHC Controller initialized\n");

return 0;
fail7:
clk_disable_unprepare(priv->clk_sdmmc);
fail6:
clk_put(priv->clk_sdmmc);
fail5_and_a_half:
Expand Down

0 comments on commit 29276d5

Please sign in to comment.