From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793212249; b=lTuN1l3ar3fHy9RHlNw5tRbwqcsw/zQuEe5vz6kKOZ9VdfGVCd1yWM/xL79ACuZY7Ecc S/Q9ndlSkKFKL+dqxN7jJogmbi3ewYF7orJfijdn7dxSpKbUvKDw9S+/cdDISrPAglC5B nVjHujm4W+wHrzLj9KF6EztkTLOUIQhbSbGVstAn/sIkG6ezDuKyf4nZfI7RZVQ4lfe/W eS5vM3W8/fKBnzHDGyhmMjXLMrfl4tVb1uH8olTYUurUmTDr/zx3muyar8/crKMvbaM7c ItEiXk2ObDXgsuIGde+5yjBzcnl1P0ppFkbqThjHHaspg4TYbxR1Ts/GUFYfDIyShmA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793212249; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=OLfOoQfGw2tlm7cnGxkT1qnc/Wf/ae7S8tkchbWeTqA=; b=2M2qsdWWSy3c/T623mu4EexQnwdi5nwF+hy864GK0/OZq0nnEyKGW2oQBHkUx0b4G6NQ AelHs36799NNZ8g+TUhjzsmsvasE99PATicmOWQUVBINpOZFI3JPvO/dxiWfMJsn6Vqwo GPN6+q50mv5RcWTKMdcjBdysRsthFg9a7eCd20ygcCZ6X6fV0sDTAs5nOElssLzIURZNg ooz2/s2WiHvJ6wbUQQ/6sWUq7MaVoe/mS9a+qQY95/Dqn/AcVcSz//02SBOjX3GRaZxuG /eB4wphLFquarmkz6t7cL9nxBaAh8TodHVu/PXuC5bKWZDYUjYnezvFYfPy/l/htTWw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=vULIYHUu; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06BCD606A327; Wed, 28 Oct 2026 18:30:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=vULIYHUu Received: by smtp.kernel.org (Postfix) with ESMTPSA id 565071F01828; Wed, 28 Oct 2026 18:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793212248; bh=OLfOoQfGw2tlm7cnGxkT1qnc/Wf/ae7S8tkchbWeTqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vULIYHUu/oXHwS57khS57boQNMvXi1PWZ/p1SP8Jqd73diwLit38vYaivulkCTydT 5XXGXXJA9BEt4LSNVbrCyMc+CcuhpgRPFUnGgRv1wru2aJSyEChdUpHNkhcA39fC2j Iwwoa7WSgP0evD76VOfsIGJQaj2Mb2ptsogdqHb8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fan Wu , Ulf Hansson , Sasha Levin Subject: [PATCH 6.1 0090/1887] mmc: via-sdmmc: cancel card-detect work on remove Date: Wed, 28 Oct 2026 17:36:26 +0100 Message-ID: <20261028170501.283461825@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170459.200466217@linuxfoundation.org> References: <20261028170459.200466217@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fan Wu [ Upstream commit 57e5d877f898d5e5c9d672a77bb6bdd24f0d9bf5 ] Disabling the device interrupt and freeing the IRQ prevents new card-detect work from being queued, but carddet_work already queued by the handler can still run after via_sd_remove() returns. via_sdc_card_detect() recovers the host through container_of() and dereferences its MMIO base; once remove() returns the host can be freed, so that work would touch freed memory. Cancel carddet_work after freeing the IRQ and before cancelling finish_bh_work, which the card-detect handler can also queue. carddet_work can re-enable the interrupt through via_reset_pcictrl(); mask it again afterwards. This issue was found by an in-house static analysis tool and confirmed by manual code review. Fixes: f0bf7f61b840 ("mmc: Add new via-sdmmc host controller driver") Cc: stable@vger.kernel.org Assisted-by: Codex:gpt-5.6 Signed-off-by: Fan Wu Signed-off-by: Ulf Hansson [ adjusted context to retain del_timer_sync() instead of timer_delete_sync(). ] Signed-off-by: Sasha Levin --- drivers/mmc/host/via-sdmmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c index 5bf508b6db0e3..3ae8f005f8fe0 100644 --- a/drivers/mmc/host/via-sdmmc.c +++ b/drivers/mmc/host/via-sdmmc.c @@ -1208,6 +1208,10 @@ static void via_sd_remove(struct pci_dev *pcidev) free_irq(pcidev->irq, sdhost); + cancel_work_sync(&sdhost->carddet_work); + /* carddet_work may re-enable the interrupt via via_reset_pcictrl(). */ + writeb(0x0, sdhost->pcictrl_mmiobase + VIA_CRDR_PCIINTCTRL); + del_timer_sync(&sdhost->timer); tasklet_kill(&sdhost->finish_tasklet); -- 2.53.0