]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
genirq: Ensure IRQ descriptor is valid when setting-up the IRQ
authorJon Hunter <jonathanh@nvidia.com>
Tue, 10 May 2016 15:14:35 +0000 (16:14 +0100)
committerMarc Zyngier <marc.zyngier@arm.com>
Wed, 11 May 2016 09:12:41 +0000 (10:12 +0100)
In the function, setup_irq(), we don't check that the descriptor
returned from irq_to_desc() is valid before we start using it. For
example chip_bus_lock() called from setup_irq(), assumes that the
descriptor pointer is valid and doesn't check before dereferencing it.

In many other functions including setup/free_percpu_irq() we do check
that the descriptor returned is not NULL and therefore add the same test
to setup_irq() to ensure the descriptor returned is valid.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
kernel/irq/manage.c

index cc1cc641d653216614ea9bab5dbe8e0bd7238788..ef0bc02c3a703dac4c3b980fb3ed3fb40ca5fe8d 100644 (file)
@@ -1407,7 +1407,7 @@ int setup_irq(unsigned int irq, struct irqaction *act)
        int retval;
        struct irq_desc *desc = irq_to_desc(irq);
 
-       if (WARN_ON(irq_settings_is_per_cpu_devid(desc)))
+       if (!desc || WARN_ON(irq_settings_is_per_cpu_devid(desc)))
                return -EINVAL;
        chip_bus_lock(desc);
        retval = __setup_irq(irq, desc, act);