4.4-stable review patch. If anyone has any objections, please let me know.
------------------ From: Vladimir Zapolskiy <v...@mleia.com> commit edf8fcdc6b254236be005851af35ea5e826e7e09 upstream. 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 <v...@mleia.com> Cc: Jason Cooper <ja...@lakedaemon.net> Cc: Marc Zyngier <marc.zyng...@arm.com> Cc: Oleksij Rempel <li...@rempel-privat.de> Cc: Sascha Hauer <ker...@pengutronix.de> Cc: Shawn Guo <shawn...@kernel.org> Cc: linux-arm-ker...@lists.infradead.org Link: http://lkml.kernel.org/r/1457486500-10237-1-git-send-email...@mleia.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- drivers/irqchip/irq-mxs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/irqchip/irq-mxs.c +++ b/drivers/irqchip/irq-mxs.c @@ -183,7 +183,7 @@ static void __iomem * __init icoll_init_ 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; }