Messages in this thread Patch in this message | | | Date | Thu, 10 Mar 2016 07:06:58 -0800 | From | tip-bot for Vladimir Zapolskiy <> | Subject | [tip:irq/core] irqchip/mxs: Fix error check of of_io_request_and_map() |
| |
Commit-ID: edf8fcdc6b254236be005851af35ea5e826e7e09 Gitweb: http://git.kernel.org/tip/edf8fcdc6b254236be005851af35ea5e826e7e09 Author: Vladimir Zapolskiy <vz@mleia.com> AuthorDate: Wed, 9 Mar 2016 03:21:40 +0200 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Thu, 10 Mar 2016 16:03:30 +0100
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> --- drivers/irqchip/irq-mxs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c index efe5084..1730470 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; }
| |