* [PATCH 4.5 140/200] irqchip/sunxi-nmi: Fix error check of of_io_request_and_map() [not found] <20160503000554.631204776@linuxfoundation.org> @ 2016-05-03 0:12 ` Greg Kroah-Hartman 2016-05-03 0:12 ` [PATCH 4.5 141/200] irqchip/mxs: " Greg Kroah-Hartman 1 sibling, 0 replies; 2+ messages in thread From: Greg Kroah-Hartman @ 2016-05-03 0:12 UTC (permalink / raw) To: linux-arm-kernel 4.5-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vladimir Zapolskiy <vz@mleia.com> commit cfe199afefe6201e998ddc07102fc1fdb55f196c 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: 0e841b04c829 ("irqchip/sunxi-nmi: Switch to of_io_request_and_map() from of_iomap()") Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Chen-Yu Tsai <wens@csie.org> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: linux-arm-kernel at lists.infradead.org Link: http://lkml.kernel.org/r/1457486489-10189-1-git-send-email-vz at mleia.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/irqchip/irq-sunxi-nmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c @@ -160,9 +160,9 @@ static int __init sunxi_sc_nmi_irq_init( gc = irq_get_domain_generic_chip(domain, 0); gc->reg_base = of_io_request_and_map(node, 0, of_node_full_name(node)); - if (!gc->reg_base) { + if (IS_ERR(gc->reg_base)) { pr_err("unable to map resource\n"); - ret = -ENOMEM; + ret = PTR_ERR(gc->reg_base); goto fail_irqd_remove; } ^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 4.5 141/200] irqchip/mxs: Fix error check of of_io_request_and_map() [not found] <20160503000554.631204776@linuxfoundation.org> 2016-05-03 0:12 ` [PATCH 4.5 140/200] irqchip/sunxi-nmi: Fix error check of of_io_request_and_map() Greg Kroah-Hartman @ 2016-05-03 0:12 ` Greg Kroah-Hartman 1 sibling, 0 replies; 2+ messages in thread From: Greg Kroah-Hartman @ 2016-05-03 0:12 UTC (permalink / raw) To: linux-arm-kernel 4.5-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vladimir Zapolskiy <vz@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 <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 at lists.infradead.org Link: http://lkml.kernel.org/r/1457486500-10237-1-git-send-email-vz at mleia.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@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; } ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-03 0:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160503000554.631204776@linuxfoundation.org>
2016-05-03 0:12 ` [PATCH 4.5 140/200] irqchip/sunxi-nmi: Fix error check of of_io_request_and_map() Greg Kroah-Hartman
2016-05-03 0:12 ` [PATCH 4.5 141/200] irqchip/mxs: " Greg Kroah-Hartman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).