From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 73F08423780; Fri, 4 Sep 2026 06:18:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788502738; cv=none; b=jsqdsE9AK0pkRFjMA9YGFJz3MukRRMlv3L811aSdnY9T6+GLowaz+pd2hEvUUFf7xJyHx+iyuziPH+U4LF+pNXxB3MI2FzTaBt/KqC5YMc1wqUP7NwtuSZJiUvXB/yWkE7oz0kGgHfXQAFXFKA3wWz3vspprOoynUk3m6AUdybk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788502738; c=relaxed/simple; bh=QAFFEdatcXfaIgCTPH45uq8PQUqVdqs4yp3KZejHe5M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UyAKaEN4WzaBFbkkrdwFP3AbnBmJVr9Tj3O2o4NG3nheUA358dBDYX5TaAUnaWQIGOHt6Z9VYY/NMxDBbOnureTBoBDLHTI2s+vHVFMLFoaS9JxxUu0zp83JiTK/llLyPquTcH/eBNfLKt/B7xRwKSNt8Y6tIvHiSO3aeSM79rA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=r2xGm3uN; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="r2xGm3uN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE8361F00A3D; Fri, 4 Sep 2026 06:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788502736; bh=ENxnBA0FOVfe2iiqa5l9E14eQyHioUKeEkTDt9GqbWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=r2xGm3uNN8ApIyTeUM2uLlBlaza94zBcj4sbuJHOUqWBuR6vUh+G8eUwIhEt7FMFe C1jRCG4/4o+wCa4wV119f7PQjnKtwCOlbo4Bi715NKn+h4R0DUcsRTfjZRxJbdzEIf UrzmSbDO4MdM0/fzH4r+T/VbYxRsic+KVHVEdjtU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fan Wu , Ulf Hansson Subject: [PATCH 6.12 310/403] mmc: via-sdmmc: stop card-detect handling on probe failure Date: Fri, 4 Sep 2026 07:01:53 +0200 Message-ID: <20260904045741.891840344@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045734.806166532@linuxfoundation.org> References: <20260904045734.806166532@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fan Wu commit 088eaa92fcebaa6b957ccf9635afdf39643a577d upstream. request_irq() registers the SD card-detect interrupt and the probe enables it before mmc_add_host() runs. If mmc_add_host() fails, the error path only unmaps the registers and returns: the interrupt stays registered, so the handler keeps running against the host once it is freed. via_sdc_isr() dereferences sdhost and its MMIO base and schedules carddet_work, which via_sdc_card_detect() also runs against freed memory through its container_of() dereference. Add a probe-error path that disables and frees the interrupt and cancels carddet_work before unmapping. carddet_work can re-enable the device interrupt via via_reset_pcictrl(), which restores PCIINTCTRL, so mask it again after cancelling the work. This issue was found by an in-house static analysis tool and confirmed by manual code review. Fixes: e4e46fb61e3b ("mmc: via-sdmmc: fix return value check of mmc_add_host()") Cc: stable@vger.kernel.org Assisted-by: Codex:gpt-5.6 Signed-off-by: Fan Wu Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/via-sdmmc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/drivers/mmc/host/via-sdmmc.c +++ b/drivers/mmc/host/via-sdmmc.c @@ -1154,10 +1154,16 @@ static int via_sd_probe(struct pci_dev * ret = mmc_add_host(mmc); if (ret) - goto unmap; + goto free_irq; return 0; +free_irq: + writeb(0x0, sdhost->pcictrl_mmiobase + VIA_CRDR_PCIINTCTRL); + 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); unmap: iounmap(sdhost->mmiobase); free_mmc_host: