* [PATCH] irqchip/mxs: fix error check of of_io_request_and_map()
@ 2016-03-09 1:21 Vladimir Zapolskiy
2016-03-10 15:06 ` [tip:irq/core] irqchip/mxs: Fix " tip-bot for Vladimir Zapolskiy
2016-03-31 6:39 ` [PATCH] irqchip/mxs: fix " Shawn Guo
0 siblings, 2 replies; 3+ messages in thread
From: Vladimir Zapolskiy @ 2016-03-09 1:21 UTC (permalink / raw)
To: Thomas Gleixner, Jason Cooper, Marc Zyngier
Cc: Oleksij Rempel, Sascha Hauer, Shawn Guo, linux-arm-kernel,
linux-kernel
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>
---
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 c22e2d4..5bec700 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;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [tip:irq/core] irqchip/mxs: Fix error check of of_io_request_and_map()
2016-03-09 1:21 [PATCH] irqchip/mxs: fix error check of of_io_request_and_map() Vladimir Zapolskiy
@ 2016-03-10 15:06 ` tip-bot for Vladimir Zapolskiy
2016-03-31 6:39 ` [PATCH] irqchip/mxs: fix " Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Vladimir Zapolskiy @ 2016-03-10 15:06 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, marc.zyngier, shawnguo, linux, jason, mingo, hpa, kernel,
linux-kernel, vz
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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] irqchip/mxs: fix error check of of_io_request_and_map()
2016-03-09 1:21 [PATCH] irqchip/mxs: fix error check of of_io_request_and_map() Vladimir Zapolskiy
2016-03-10 15:06 ` [tip:irq/core] irqchip/mxs: Fix " tip-bot for Vladimir Zapolskiy
@ 2016-03-31 6:39 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2016-03-31 6:39 UTC (permalink / raw)
To: Vladimir Zapolskiy
Cc: Thomas Gleixner, Jason Cooper, Marc Zyngier, Oleksij Rempel,
Sascha Hauer, linux-arm-kernel, linux-kernel
On Wed, Mar 09, 2016 at 03:21:40AM +0200, Vladimir Zapolskiy wrote:
> 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>
Acked-by: Shawn Guo <shawnguo@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-31 6:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-09 1:21 [PATCH] irqchip/mxs: fix error check of of_io_request_and_map() Vladimir Zapolskiy
2016-03-10 15:06 ` [tip:irq/core] irqchip/mxs: Fix " tip-bot for Vladimir Zapolskiy
2016-03-31 6:39 ` [PATCH] irqchip/mxs: fix " Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox