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

Commit a47d4576 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/irq: Do not dereference irq descriptor before checking it 



Having the IS_NULL_OR_ERR() check after dereferencing the pointer is
not really working well.

Move the dereference after the check.

Fixes: a782a7e4 'x86/irq: Store irq descriptor in vector array'
Reported-and-tested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b51aa1cc

arch/x86/kernel/irq_32.c

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ void do_softirq_own_stack(void) 


bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)

{

	unsigned int irq = irq_desc_get_irq(desc);

	unsigned int irq;

	int overflow;



	overflow = check_stack_overflow();
@@ -158,6 +158,7 @@ bool handle_irq(struct irq_desc *desc, struct pt_regs *regs) 
	if (IS_ERR_OR_NULL(desc))

		return false;



	irq = irq_desc_get_irq(desc);

	if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {

		if (unlikely(overflow))

			print_stack_overflow();