From: Sasha Levin Date: Sun, 25 Dec 2022 13:02:46 +0000 (-0500) Subject: Drop mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch from older trees X-Git-Tag: v5.15.86~74 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6788e1f3a84782df1a749ebd5676f98a2c6f81f5;p=thirdparty%2Fkernel%2Fstable-queue.git Drop mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch from older trees --- diff --git a/queue-4.14/mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch b/queue-4.14/mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch deleted file mode 100644 index 88c53fb679f..00000000000 --- a/queue-4.14/mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 36dadd6f8eab2969df34963e184520bf8cbe8317 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 1 Nov 2022 14:30:18 +0800 -Subject: mmc: pxamci: fix return value check of mmc_add_host() - -From: Yang Yingliang - -[ 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 -Link: https://lore.kernel.org/r/20221101063023.1664968-5-yangyingliang@huawei.com -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/pxamci.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c -index 3e139692fe8f..f6a2f10d7d12 100644 ---- a/drivers/mmc/host/pxamci.c -+++ b/drivers/mmc/host/pxamci.c -@@ -816,7 +816,12 @@ static int pxamci_probe(struct platform_device *pdev) - if (gpio_is_valid(gpio_ro) && host->pdata->get_ro) - dev_warn(&pdev->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; - --- -2.35.1 - diff --git a/queue-4.14/series b/queue-4.14/series index c0fcca1c3fb..041f1c15809 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -105,7 +105,6 @@ sunrpc-fix-missing-release-socket-in-rpc_sockname.patch nfsv4.x-fail-client-initialisation-if-state-manager-.patch mmc-moxart-fix-return-value-check-of-mmc_add_host.patch mmc-mxcmmc-fix-return-value-check-of-mmc_add_host.patch -mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch mmc-rtsx_usb_sdmmc-fix-return-value-check-of-mmc_add.patch mmc-toshsd-fix-return-value-check-of-mmc_add_host.patch mmc-vub300-fix-return-value-check-of-mmc_add_host.patch diff --git a/queue-4.19/mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch b/queue-4.19/mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch deleted file mode 100644 index 6a5478fa751..00000000000 --- a/queue-4.19/mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 52a95ad54ec9fa84d2681cd5837668aed94b3cdb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 1 Nov 2022 14:30:18 +0800 -Subject: mmc: pxamci: fix return value check of mmc_add_host() - -From: Yang Yingliang - -[ 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 -Link: https://lore.kernel.org/r/20221101063023.1664968-5-yangyingliang@huawei.com -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/pxamci.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c -index d0db1c37552f..e90a84e0cbda 100644 ---- a/drivers/mmc/host/pxamci.c -+++ b/drivers/mmc/host/pxamci.c -@@ -779,7 +779,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; - --- -2.35.1 - diff --git a/queue-4.9/series b/queue-4.9/series index b6a30962b4a..72a373618a4 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -83,7 +83,6 @@ alsa-mts64-fix-possible-null-ptr-defer-in-snd_mts64_.patch sunrpc-fix-missing-release-socket-in-rpc_sockname.patch mmc-moxart-fix-return-value-check-of-mmc_add_host.patch mmc-mxcmmc-fix-return-value-check-of-mmc_add_host.patch -mmc-pxamci-fix-return-value-check-of-mmc_add_host.patch mmc-rtsx_usb_sdmmc-fix-return-value-check-of-mmc_add.patch mmc-toshsd-fix-return-value-check-of-mmc_add_host.patch mmc-vub300-fix-return-value-check-of-mmc_add_host.patch