summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2022-11-08 21:09:49 +0800
committerUlf Hansson <ulf.hansson@linaro.org>2022-12-07 13:22:35 +0100
commite4e46fb61e3bb4628170810d3f2b996b709b90d9 (patch)
treeb14f23522c2ef4b4070e9f55744a0c54bec6ec61
parent90935f16f2650ab7416fa2ffbe5c28cb39cf3f1e (diff)
downloadlinux-stable-e4e46fb61e3bb4628170810d3f2b996b709b90d9.tar.gz
linux-stable-e4e46fb61e3bb4628170810d3f2b996b709b90d9.tar.bz2
linux-stable-e4e46fb61e3bb4628170810d3f2b996b709b90d9.zip
mmc: via-sdmmc: fix return value check of mmc_add_host()
mmc_add_host() may return error, if we ignore its return value, it will lead two issues: 1. The memory that allocated in mmc_alloc_host() is leaked. 2. In the remove() path, mmc_remove_host() will be called to delete device, but it's not added yet, it will lead a kernel crash because of null-ptr-deref in device_del(). Fix this by checking the return value and goto error path which will call mmc_free_host(). Fixes: f0bf7f61b840 ("mmc: Add new via-sdmmc host controller driver") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://lore.kernel.org/r/20221108130949.1067699-1-yangyingliang@huawei.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/via-sdmmc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c
index 88662a90ed96..a2b0d9461665 100644
--- a/drivers/mmc/host/via-sdmmc.c
+++ b/drivers/mmc/host/via-sdmmc.c
@@ -1151,7 +1151,9 @@ static int via_sd_probe(struct pci_dev *pcidev,
pcidev->subsystem_device == 0x3891)
sdhost->quirks = VIA_CRDR_QUIRK_300MS_PWRDELAY;
- mmc_add_host(mmc);
+ ret = mmc_add_host(mmc);
+ if (ret)
+ goto unmap;
return 0;