irqdomain: Prevent potential NULL pointer dereference in irq_domain_push_irq()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 25 Aug 2017 12:14:09 +0000 (15:14 +0300)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 25 Aug 2017 20:40:26 +0000 (22:40 +0200)
This code generates a Smatch warning:

  kernel/irq/irqdomain.c:1511 irq_domain_push_irq()
  warn: variable dereferenced before check 'root_irq_data' (see line 1508)

irq_get_irq_data() can return a NULL pointer, but the code dereferences
the returned pointer before checking it.

Move the NULL pointer check before the dereference.

[ tglx: Rewrote changelog to be precise and conforming to the instructions
   in submitting-patches and added a Fixes tag. Sigh! ]

Fixes: 495c38d3001f ("irqdomain: Add irq_domain_{push,pop}_irq() functions")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David Daney <david.daney@cavium.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/20170825121409.6rfv4vt6ztz2oqkt@mwanda
kernel/irq/irqdomain.c

index 1ff9912211e92e7785220e2d76272f889d9fb702..d62351714f3e3f8442fd7955fb7caaba2e6c069a 100644 (file)
@@ -1504,10 +1504,10 @@ int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg)
        if (WARN_ON(!irq_domain_is_hierarchy(domain)))
                return -EINVAL;
 
-       if (domain->parent != root_irq_data->domain)
+       if (!root_irq_data)
                return -EINVAL;
 
-       if (!root_irq_data)
+       if (domain->parent != root_irq_data->domain)
                return -EINVAL;
 
        child_irq_data = kzalloc_node(sizeof(*child_irq_data), GFP_KERNEL,