Skip to content

Commit 5aac99c

Browse files
committed
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()
2 parents e8ab83e + 38a05c0 commit 5aac99c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/irqchip/irq-qcom-mpm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ static int qcom_mpm_alloc(struct irq_domain *domain, unsigned int virq,
227227
if (ret)
228228
return ret;
229229

230+
if (pin == GPIO_NO_WAKE_IRQ)
231+
return irq_domain_disconnect_hierarchy(domain, virq);
232+
230233
ret = irq_domain_set_hwirq_and_chip(domain, virq, pin,
231234
&qcom_mpm_chip, priv);
232235
if (ret)

kernel/irq/msi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ static int msi_domain_translate(struct irq_domain *domain, struct irq_fwspec *fw
761761
static void msi_domain_debug_show(struct seq_file *m, struct irq_domain *d,
762762
struct irq_data *irqd, int ind)
763763
{
764-
struct msi_desc *desc = irq_data_get_msi_desc(irqd);
764+
struct msi_desc *desc = irqd ? irq_data_get_msi_desc(irqd) : NULL;
765765

766766
if (!desc)
767767
return;

0 commit comments

Comments
 (0)