Skip to content

Commit be93028

Browse files
committed
moxart: fix potential use-after-free on remove path
commit bd2db32 upstream. 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> Link: https://lore.kernel.org/r/20220127071638.4057899-1-gregkh@linuxfoundation.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fb063a6 commit be93028

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/mmc/host/moxart-mmc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,12 +708,12 @@ static int moxart_remove(struct platform_device *pdev)
708708
if (!IS_ERR_OR_NULL(host->dma_chan_rx))
709709
dma_release_channel(host->dma_chan_rx);
710710
mmc_remove_host(mmc);
711-
mmc_free_host(mmc);
712711

713712
writel(0, host->base + REG_INTERRUPT_MASK);
714713
writel(0, host->base + REG_POWER_CONTROL);
715714
writel(readl(host->base + REG_CLOCK_CONTROL) | CLK_OFF,
716715
host->base + REG_CLOCK_CONTROL);
716+
mmc_free_host(mmc);
717717

718718
return 0;
719719
}

0 commit comments

Comments
 (0)