]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
irqchip/mxs: Panic if ioremap or domain creation fails
authorOleksij Rempel <linux@rempel-privat.de>
Mon, 12 Oct 2015 19:15:30 +0000 (21:15 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 14 Oct 2015 07:37:47 +0000 (09:37 +0200)
Current code will only warn and then dereference the NULL pointer or
continue, which results in a fatal NULL pointer dereference later.

If the initialization fails, the machine is unusable, so panic right
away.

[ tglx: Massaged changelog and picked the irqdomain panic from the
   next patch]

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Tested-by: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: marc.zyngier@arm.com
Cc: jason@lakedaemon.net
Link: http://lkml.kernel.org/r/1444677334-12242-2-git-send-email-linux@rempel-privat.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/irqchip/irq-mxs.c

index 604df63e2edf6f9706db28d08bf559a0347e8bd8..96148a7beba129ff84d557c437058dd06ec7395a 100644 (file)
@@ -97,7 +97,8 @@ static int __init icoll_of_init(struct device_node *np,
                          struct device_node *interrupt_parent)
 {
        icoll_base = of_iomap(np, 0);
-       WARN_ON(!icoll_base);
+       if (!icoll_base)
+               panic("%s: unable to map resource", np->full_name);
 
        /*
         * Interrupt Collector reset, which initializes the priority
@@ -107,6 +108,9 @@ static int __init icoll_of_init(struct device_node *np,
 
        icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS,
                                             &icoll_irq_domain_ops, NULL);
-       return icoll_domain ? 0 : -ENODEV;
+       if (!icoll_domain)
+               panic("%s: unable to create irqdomain", np->full_name);
+
+       return 0;
 }
 IRQCHIP_DECLARE(mxs, "fsl,icoll", icoll_of_init);