mmc: pxamci: fix return value check of mmc_add_host()
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 1 Nov 2022 06:30:18 +0000 (14:30 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:24 +0000 (13:32 +0100)
[ Upstream commit 80e1ef3afb8bfbe768380b70ffe1b6cab87d1a3b ]

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, ->exit() need be called to uninit the pdata.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20221101063023.1664968-5-yangyingliang@huawei.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mmc/host/pxamci.c

index e4003f6..2a988f9 100644 (file)
@@ -763,7 +763,12 @@ static int pxamci_probe(struct platform_device *pdev)
                        dev_warn(dev, "gpio_ro and get_ro() both defined\n");
        }
 
-       mmc_add_host(mmc);
+       ret = mmc_add_host(mmc);
+       if (ret) {
+               if (host->pdata && host->pdata->exit)
+                       host->pdata->exit(dev, mmc);
+               goto out;
+       }
 
        return 0;