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 C7FD0481241; Sat, 12 Sep 2026 18:17:04 +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=1789237026; cv=none; b=F1tvnPFsnP/TpCpyWMPCJe1yJdL/Ipzzj2wlmMmjAp9mfUm4Sf2HTHeNyKObI4kKVSCeG4cG+8Z1WIQI5Qtizi7P6ySFrypSbPU6/JGaNX5GYBAbMbSs9b3s2VkkKxJSyy8j7NVR4K9GaRaLpUd2aN3hkljRSdIHFYdRZ4PL2V8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789237026; c=relaxed/simple; bh=6lI+IX/6tZEHUY0rAPMupm1lVPNaPfIQPU1mjfdK154=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qFTjji3ZHhhnhPz93+nI+4wcJUDRcDKk/IRc0q0dgdqb7BEVJDnqwpFmlfN9YjHa/A6AzMxF5g1lDXsDXAoJTIGKgtmqCtgVZrBwk6gJmZbbOU5JSPU+Wz0OoM0Xew6fCH39N4EhYUbINR56SRUEuxSMgTioeI+ca4KRxVBaPPg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kz9pwH3j; 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="kz9pwH3j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 816FF1F000FF; Sat, 12 Sep 2026 18:17:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789237024; bh=p0IjnndbT0mJhZSxHGQLDT6UyMdw+DkAbsHX6fUJXCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kz9pwH3jb5V/S6fpRcwWVpeiayAMkddblTbDebaVxCjevT1OA6Yg9cLteIJ+6nTKR Usl7ICY2ssASLFA9pWgsBEAv0hsaIwmi0skDXVQd4OKYI1fXiwzpaJLnW2c812A+ZB +wWjXe9Vzm4aebsmAykCcj7GejEX7ILxjg0fjplk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fan Wu , Ulf Hansson Subject: [PATCH 5.15 168/935] mmc: via-sdmmc: stop card-detect handling on probe failure Date: Sat, 12 Sep 2026 08:53:18 +0200 Message-ID: <20260912065530.670140945@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065526.833703348@linuxfoundation.org> References: <20260912065526.833703348@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 5.15-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 @@ -1153,10 +1153,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: