* [PATCH v2] moxart: fix potential use-after-free on remove path
@ 2022-01-27 7:16 Greg Kroah-Hartman
2022-01-31 14:39 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Greg Kroah-Hartman @ 2022-01-27 7:16 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, Ulf Hansson, Xiyu Yang, Xin Xiong, Xin Tan,
Tony Lindgren, Yang Li, linux-mmc, stable, whitehat002
It was reported that the mmc host structure could be accessed after it
was freed in moxart_remove(), so fix this by saving the base register of
the device and using it instead of the pointer dereference.
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Cc: Xin Xiong <xiongx18@fudan.edu.cn>
Cc: Xin Tan <tanxin.ctf@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Yang Li <yang.lee@linux.alibaba.com>
Cc: linux-mmc@vger.kernel.org
Cc: stable <stable@vger.kernel.org>
Reported-by: whitehat002 <hackyzh002@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
v2: changed to only move mmc_free_host() call as per Ulf's request
drivers/mmc/host/moxart-mmc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c
index 16d1c7a43d33..b6eb75f4bbfc 100644
--- a/drivers/mmc/host/moxart-mmc.c
+++ b/drivers/mmc/host/moxart-mmc.c
@@ -705,12 +705,12 @@ static int moxart_remove(struct platform_device *pdev)
if (!IS_ERR_OR_NULL(host->dma_chan_rx))
dma_release_channel(host->dma_chan_rx);
mmc_remove_host(mmc);
- mmc_free_host(mmc);
writel(0, host->base + REG_INTERRUPT_MASK);
writel(0, host->base + REG_POWER_CONTROL);
writel(readl(host->base + REG_CLOCK_CONTROL) | CLK_OFF,
host->base + REG_CLOCK_CONTROL);
+ mmc_free_host(mmc);
return 0;
}
--
2.35.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] moxart: fix potential use-after-free on remove path
2022-01-27 7:16 [PATCH v2] moxart: fix potential use-after-free on remove path Greg Kroah-Hartman
@ 2022-01-31 14:39 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2022-01-31 14:39 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-kernel, Xiyu Yang, Xin Xiong, Xin Tan, Tony Lindgren,
Yang Li, linux-mmc, stable, whitehat002
On Thu, 27 Jan 2022 at 08:16, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> It was reported that the mmc host structure could be accessed after it
> was freed in moxart_remove(), so fix this by saving the base register of
> the device and using it instead of the pointer dereference.
>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: Xiyu Yang <xiyuyang19@fudan.edu.cn>
> Cc: Xin Xiong <xiongx18@fudan.edu.cn>
> Cc: Xin Tan <tanxin.ctf@gmail.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Yang Li <yang.lee@linux.alibaba.com>
> Cc: linux-mmc@vger.kernel.org
> Cc: stable <stable@vger.kernel.org>
> Reported-by: whitehat002 <hackyzh002@gmail.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Applied for fixes, thanks!
Kind regards
Uffe
> ---
> v2: changed to only move mmc_free_host() call as per Ulf's request
>
> drivers/mmc/host/moxart-mmc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c
> index 16d1c7a43d33..b6eb75f4bbfc 100644
> --- a/drivers/mmc/host/moxart-mmc.c
> +++ b/drivers/mmc/host/moxart-mmc.c
> @@ -705,12 +705,12 @@ static int moxart_remove(struct platform_device *pdev)
> if (!IS_ERR_OR_NULL(host->dma_chan_rx))
> dma_release_channel(host->dma_chan_rx);
> mmc_remove_host(mmc);
> - mmc_free_host(mmc);
>
> writel(0, host->base + REG_INTERRUPT_MASK);
> writel(0, host->base + REG_POWER_CONTROL);
> writel(readl(host->base + REG_CLOCK_CONTROL) | CLK_OFF,
> host->base + REG_CLOCK_CONTROL);
> + mmc_free_host(mmc);
>
> return 0;
> }
> --
> 2.35.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-31 14:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-27 7:16 [PATCH v2] moxart: fix potential use-after-free on remove path Greg Kroah-Hartman
2022-01-31 14:39 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).