diff options
author | Vladimir Zapolskiy <vz@mleia.com> | 2016-03-09 03:21:40 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-03-10 16:03:30 +0100 |
commit | edf8fcdc6b254236be005851af35ea5e826e7e09 (patch) | |
tree | baf85238a4aa1b87e958d0af1b6a7b48be503b19 /drivers/irqchip/irq-mxs.c | |
parent | cfe199afefe6201e998ddc07102fc1fdb55f196c (diff) | |
download | linux-edf8fcdc6b254236be005851af35ea5e826e7e09.tar.bz2 |
irqchip/mxs: Fix error check of of_io_request_and_map()
The of_io_request_and_map() returns a valid pointer in iomem region or
ERR_PTR(), check for NULL always fails and may cause a NULL pointer
dereference on error path.
Fixes: 25e34b44313b ("irqchip/mxs: Prepare driver for hardware with different offsets")
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Oleksij Rempel <linux@rempel-privat.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1457486500-10237-1-git-send-email-vz@mleia.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip/irq-mxs.c')
-rw-r--r-- | drivers/irqchip/irq-mxs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c index efe50845939d..17304705f2cf 100644 --- a/drivers/irqchip/irq-mxs.c +++ b/drivers/irqchip/irq-mxs.c @@ -183,7 +183,7 @@ static void __iomem * __init icoll_init_iobase(struct device_node *np) void __iomem *icoll_base; icoll_base = of_io_request_and_map(np, 0, np->name); - if (!icoll_base) + if (IS_ERR(icoll_base)) panic("%s: unable to map resource", np->full_name); return icoll_base; } |