summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-08-28 10:30:15 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-08-28 10:30:15 +0200
commita47d4576cd1c58157a2d8cfffa93aa7ca375eede (patch)
treece12e2951db7b593bc6b9621107758fa0791d5ff /arch/x86
parentb51aa1cc7807f4dff7b70a762aa6d8814976d706 (diff)
downloadop-kernel-dev-a47d4576cd1c58157a2d8cfffa93aa7ca375eede.zip
op-kernel-dev-a47d4576cd1c58157a2d8cfffa93aa7ca375eede.tar.gz
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: a782a7e46bb5 'x86/irq: Store irq descriptor in vector array' Reported-and-tested-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/irq_32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 217b013..c80cf66 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -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();
OpenPOWER on IntegriCloud