]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: via-sdmmc: fix return value check of mmc_add_host()
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 8 Nov 2022 13:09:49 +0000 (21:09 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Jan 2023 11:07:20 +0000 (12:07 +0100)
[ Upstream commit e4e46fb61e3bb4628170810d3f2b996b709b90d9 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mmc/host/via-sdmmc.c

index a3472127bea315dc329511a4ae737a5b4658f6da..74ac1ac55f42a527ad948976dbbba16525fad33e 100644 (file)
@@ -1162,7 +1162,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;