Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI/keystone: Fix race in installing chained IRQ handler

Fix a race where a pending interrupt could be received and the handler
called before the handler's data has been setup, by converting to
irq_set_chained_handler_and_data().

Search and conversion was done with coccinelle:

@@
expression E1, E2, E3;
@@
(
-if (irq_set_chained_handler(E1, E3) != 0)
- BUG();
|
-irq_set_chained_handler(E1, E3);
)
-irq_set_handler_data(E1, E2);
+irq_set_chained_handler_and_data(E1, E3, E2);

@@
expression E1, E2, E3;
@@
(
-if (irq_set_chained_handler(E1, E3) != 0)
- BUG();
...
|
-irq_set_chained_handler(E1, E3);
...
)
-irq_set_handler_data(E1, E2);
+irq_set_chained_handler_and_data(E1, E3, E2);

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org

+3 -4
+3 -4
drivers/pci/host/pci-keystone.c
··· 223 223 /* MSI IRQ */ 224 224 if (IS_ENABLED(CONFIG_PCI_MSI)) { 225 225 for (i = 0; i < ks_pcie->num_msi_host_irqs; i++) { 226 - irq_set_chained_handler(ks_pcie->msi_host_irqs[i], 227 - ks_pcie_msi_irq_handler); 228 - irq_set_handler_data(ks_pcie->msi_host_irqs[i], 229 - ks_pcie); 226 + irq_set_chained_handler_and_data(ks_pcie->msi_host_irqs[i], 227 + ks_pcie_msi_irq_handler, 228 + ks_pcie); 230 229 } 231 230 } 232 231 }