Commit 5aac99c6 authored May 04, 2025 by Linus Torvalds

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

Pull irq fixes from Ingo Molnar:

 - Prevent NULL pointer dereference in msi_domain_debug_show()

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

* tag 'irq-urgent-2025-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/qcom-mpm: Prevent crash when trying to handle non-wake GPIOs
  genirq/msi: Prevent NULL pointer dereference in msi_domain_debug_show()

parents e8ab83e3 38a05c0b

drivers/irqchip/irq-qcom-mpm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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;