Skip to contentSkip to conversation

IRQ fixes

GIT PULL Merged Ingo Molnar 2 participants 2 messages May 4, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest irq/urgent Git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2025-05-04

# HEAD: 38a05c0b87833f5b188ae43b428b1f792df2b384 irqchip/qcom-mpm: Prevent crash when trying to handle non-wake GPIOs

Two fixes:

- Prevent NULL pointer dereference in msi_domain_debug_show()

- Fix crash in the qcom-mpm irqchip driver when configuring interrupts for non-wake GPIOs

Thanks,

Ingo

------------------>
Andrew Jones (1):
genirq/msi: Prevent NULL pointer dereference in msi_domain_debug_show()

Stephan Gerhold (1):
irqchip/qcom-mpm: Prevent crash when trying to handle non-wake GPIOs

 drivers/irqchip/irq-qcom-mpm.c | 3 +++
 kernel/irq/msi.c               | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/irqchip/irq-qcom-mpm.c +3 -0
index 7942d8eb3d00..f772deb9cba5 100644
@@ -227,6 +227,9 @@ static int qcom_mpm_alloc(struct irq_domain *domain, unsigned int virq,
 	if (ret)
 		return ret;
 
+	if (pin == GPIO_NO_WAKE_IRQ)
+		return irq_domain_disconnect_hierarchy(domain, virq);
+
 	ret = irq_domain_set_hwirq_and_chip(domain, virq, pin,
 					    &qcom_mpm_chip, priv);
 	if (ret)
kernel/irq/msi.c +1 -1
index 5c8d43cdb0a3..c05ba7ca00fa 100644
@@ -761,7 +761,7 @@ static int msi_domain_translate(struct irq_domain *domain, struct irq_fwspec *fw
 static void msi_domain_debug_show(struct seq_file *m, struct irq_domain *d,
 				  struct irq_data *irqd, int ind)
 {
-	struct msi_desc *desc = irq_data_get_msi_desc(irqd);
+	struct msi_desc *desc = irqd ? irq_data_get_msi_desc(irqd) : NULL;
 
 	if (!desc)
 		return;