Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20424d85 authored by Andreas Larsson's avatar Andreas Larsson Committed by David S. Miller
Browse files

sparc32, leon: Check for existent irq_map entry in leon_handle_ext_irq 



If an irq is being unlinked concurrently with leon_handle_ext_irq,
irq_map[eirq] might be null in leon_handle_ext_irq. Make sure that
this is not dereferenced.

Signed-off-by: default avatarAndreas Larsson <andreas@gaisler.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5cf8f7db

arch/sparc/kernel/leon_kernel.c

+4 −2
Original line number Diff line number Diff line
@@ -56,11 +56,13 @@ static inline unsigned int leon_eirq_get(int cpu) 
static void leon_handle_ext_irq(unsigned int irq, struct irq_desc *desc)

{

	unsigned int eirq;

	struct irq_bucket *p;

	int cpu = sparc_leon3_cpuid();



	eirq = leon_eirq_get(cpu);

	if ((eirq & 0x10) && irq_map[eirq]->irq) /* bit4 tells if IRQ happened */

		generic_handle_irq(irq_map[eirq]->irq);

	p = irq_map[eirq];

	if ((eirq & 0x10) && p && p->irq) /* bit4 tells if IRQ happened */

		generic_handle_irq(p->irq);

}



/* The extended IRQ controller has been found, this function registers it */