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 6678B412C0E for ; Tue, 14 Jul 2026 17:49:21 +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=1784051378; cv=none; b=bIPDnNrrmwjprJ8b2e5bSqp3Y6xehh6e0jsgzQHPFP2f3aKj6OfFpY6w19Tg5pyhDYozEpo6l/DD3dtGBm4XbRqFITD/PAXNqNz8I3Ah21baMq3u7T3Ye1mCIqZ5ikJ6EfU9w6glSRSexY+A95nC8K7drbCSErPjm3EuQ1jlpn4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784051378; c=relaxed/simple; bh=ADmiX/pW2WYHJw5KBLCIo3NbnVApKaBu0DmP8EN27Ag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hNt8Ye2alMZI4dl8VI27f4juKsdqb7h5aOGRUxsa64Zy0QL15XRCsuamlanD6lmv4EMhZbNvjNN9fJ22ipDemmds0/KQm80/TjcotziI1UA7JtfX2R9PX7j50QTfordoK+E8bYSIZjmEy8PuI5+vPcvKZATRbWeXWMrQd2qBC80= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OobAn9ct; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OobAn9ct" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B29D1F00A3F; Tue, 14 Jul 2026 17:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784051358; bh=EglM51Llcv28DVErNZrKz2d/s65XplAMQoDBEX3n/sI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OobAn9ctYreLKrBvJQjR66NBgky0C8tVshTASHiq9aD4y63rUlVfwvn23HmGN+OW9 r1rvyfBuZvMc/qcI8sVlyPa9zzc0/hFOHuSFuOMygqH+HmpsP0rPif0FwFI0w3VLdE SCDNTkSCZzeqdB06ynK1QaO0FA6SNc6iEsI+OAwjJhfgJjqBsd+gfmM7zNrbNva5Tr cAEGo92ZnNTUfBTJx0g2JFtQroJbKVi0BOHIJRRgCOsoFx+o5lO44+DkXWbYmizQI2 P+9fcFaBbSvuoMKOWWuL7DW3JwJLDGvPMdSjs2KJyrYJDOSz6ELjMCdt78g8WRCEx+ kKblPiucNLzNg== From: Sasha Levin To: stable@vger.kernel.org Cc: Mahesh Vaidya , Manivannan Sadhasivam , "Subhransu S. Prusty" , Sasha Levin Subject: [PATCH 5.10.y] PCI: altera: Fix resource leaks on probe failure Date: Tue, 14 Jul 2026 13:49:16 -0400 Message-ID: <20260714174916.3041625-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026071330-snugly-map-ad62@gregkh> References: <2026071330-snugly-map-ad62@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mahesh Vaidya [ Upstream commit 7a94138caeb27f3c49c1dbd93bf422098925bb28 ] The chained IRQ handler is set during probe, but is only removed during the driver remove(). If pci_host_probe() fails, the handler and INTx IRQ domain remain set even though the devm-managed host bridge storage containing struct altera_pcie will be released, leaving the handler with a stale data pointer. Interrupts are also enabled before pci_host_probe() is called. If probe fails after that point, the controller interrupt source should be disabled before the chained handler and INTx domain are removed. So set the chained handler only after the INTx domain has been created. Disable controller interrupts during IRQ teardown, and tear the IRQ setup down if pci_host_probe() fails. Fixes: c63aed7334c2 ("PCI: altera: Use pci_host_probe() to register host") Signed-off-by: Mahesh Vaidya [mani: commit log] Signed-off-by: Manivannan Sadhasivam Reviewed-by: Subhransu S. Prusty Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260430204330.3121003-3-mahesh.vaidya@altera.com Signed-off-by: Sasha Levin --- drivers/pci/controller/pcie-altera.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c index 523bd928b380a4..5738d5f2a4327e 100644 --- a/drivers/pci/controller/pcie-altera.c +++ b/drivers/pci/controller/pcie-altera.c @@ -685,8 +685,18 @@ static int altera_pcie_init_irq_domain(struct altera_pcie *pcie) return 0; } +static void altera_pcie_disable_irq(struct altera_pcie *pcie) +{ + if (pcie->pcie_data->version == ALTERA_PCIE_V1 || + pcie->pcie_data->version == ALTERA_PCIE_V2) { + /* Disable all P2A interrupts */ + cra_writel(pcie, 0, P2A_INT_ENABLE); + } +} + static void altera_pcie_irq_teardown(struct altera_pcie *pcie) { + altera_pcie_disable_irq(pcie); irq_set_chained_handler_and_data(pcie->irq, NULL, NULL); irq_domain_remove(pcie->irq_domain); irq_dispose_mapping(pcie->irq); @@ -712,7 +722,6 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) if (pcie->irq < 0) return pcie->irq; - irq_set_chained_handler_and_data(pcie->irq, altera_pcie_isr, pcie); return 0; } @@ -797,6 +806,12 @@ static int altera_pcie_probe(struct platform_device *pdev) return ret; } + /* + * The chained handler uses pcie->irq_domain, so set it only after the + * INTx domain has been created. + */ + irq_set_chained_handler_and_data(pcie->irq, altera_pcie_isr, pcie); + /* clear all interrupts */ cra_writel(pcie, P2A_INT_STS_ALL, P2A_INT_STATUS); /* enable all interrupts */ @@ -807,7 +822,16 @@ static int altera_pcie_probe(struct platform_device *pdev) bridge->busnr = pcie->root_bus_nr; bridge->ops = &altera_pcie_ops; - return pci_host_probe(bridge); + ret = pci_host_probe(bridge); + if (ret) + goto err_teardown_irq; + + return 0; + +err_teardown_irq: + altera_pcie_irq_teardown(pcie); + + return ret; } static int altera_pcie_remove(struct platform_device *pdev) -- 2.53.0