Skip to contentSkip to conversation

Patch "irqchip/mxs: Fix error check of of_io_request_and_map()" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message May 2, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

irqchip/mxs: Fix error check of of_io_request_and_map()

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
irqchip-mxs-fix-error-check-of-of_io_request_and_map.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From edf8fcdc6b254236be005851af35ea5e826e7e09 Mon Sep 17 00:00:00 2001

From: Vladimir Zapolskiy <[email protected]>
Date: Wed, 9 Mar 2016 03:21:40 +0200
Subject: irqchip/mxs: Fix error check of of_io_request_and_map()

From: Vladimir Zapolskiy <[email protected]>

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")
Cc Jason Cooper <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Oleksij Rempel <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Shawn Guo <[email protected]>
---
 drivers/irqchip/irq-mxs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-mxs.c +1 -1
@@ -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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/irqchip-mxs-fix-error-check-of-of_io_request_and_map.patch queue-4.5/pwm-brcmstb-fix-check-of-devm_ioremap_resource-return-code.patch queue-4.5/irqchip-sunxi-nmi-fix-error-check-of-of_io_request_and_map.patch