]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Jul 2026 13:20:23 +0000 (15:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Jul 2026 13:20:23 +0000 (15:20 +0200)
added patches:
pci-altera-do-not-dispose-parent-irq-mapping.patch

queue-5.15/pci-altera-do-not-dispose-parent-irq-mapping.patch [new file with mode: 0644]
queue-5.15/series

diff --git a/queue-5.15/pci-altera-do-not-dispose-parent-irq-mapping.patch b/queue-5.15/pci-altera-do-not-dispose-parent-irq-mapping.patch
new file mode 100644 (file)
index 0000000..caf0d8c
--- /dev/null
@@ -0,0 +1,46 @@
+From 5ef4bac02189bee0b7c170e352d7a38e13fe9678 Mon Sep 17 00:00:00 2001
+From: Mahesh Vaidya <mahesh.vaidya@altera.com>
+Date: Thu, 30 Apr 2026 13:43:29 -0700
+Subject: PCI: altera: Do not dispose parent IRQ mapping
+
+From: Mahesh Vaidya <mahesh.vaidya@altera.com>
+
+commit 5ef4bac02189bee0b7c170e352d7a38e13fe9678 upstream.
+
+altera_pcie_irq_teardown() calls irq_dispose_mapping() on pcie->irq.
+However, pcie->irq is the parent IRQ returned by platform_get_irq(), not
+the mapping created by Altera INTx irq_domain.
+
+The Altera driver only sets the chained handler on the parent IRQ. It
+should detach that handler during teardown, but it should not dispose the
+parent IRQ mapping, which belongs to the parent interrupt controller's
+irq_domain.
+
+Drop irq_dispose_mapping(pcie->irq) from the teardown path.
+
+Note that during irqchip remove(), the child IRQs should've disposed. But
+since the chained handler itself is removed, there is no way the stale
+child IRQs (if exists) could fire. So it is safe here.
+
+Fixes: ec15c4d0d5d2 ("PCI: altera: Allow building as module")
+Signed-off-by: Mahesh Vaidya <mahesh.vaidya@altera.com>
+[mani: added a note about IRQ disposal]
+Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
+Reviewed-by: Subhransu S. Prusty <subhransu.sekhar.prusty@altera.com>
+Cc: stable@vger.kernel.org
+Link: https://patch.msgid.link/20260430204330.3121003-2-mahesh.vaidya@altera.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/pci/controller/pcie-altera.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/pci/controller/pcie-altera.c
++++ b/drivers/pci/controller/pcie-altera.c
+@@ -687,7 +687,6 @@ static void altera_pcie_irq_teardown(str
+ {
+       irq_set_chained_handler_and_data(pcie->irq, NULL, NULL);
+       irq_domain_remove(pcie->irq_domain);
+-      irq_dispose_mapping(pcie->irq);
+ }
+ static int altera_pcie_parse_dt(struct altera_pcie *pcie)
index 4d5062db526b7fba936cbdd19981711b7921e2a9..07cb6c18e89f039ad83ad0d4d5f106f366ecbf4c 100644 (file)
@@ -80,3 +80,4 @@ bluetooth-btusb-fix-wakeup-source-leak-on-probe-failure.patch
 binder-fix-uaf-in-binder_thread_release.patch
 binder-fix-uaf-in-binder_free_transaction.patch
 usb-xhci-fix-sleep-in-atomic-context-in-xhci_free_streams.patch
+pci-altera-do-not-dispose-parent-irq-mapping.patch