Skip to contentSkip to conversation

Patch "irqchip/sunxi-nmi: 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/sunxi-nmi: 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-sunxi-nmi-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 cfe199afefe6201e998ddc07102fc1fdb55f196c Mon Sep 17 00:00:00 2001

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

From: Vladimir Zapolskiy <[email protected]>

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()")
Cc Jason Cooper <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Chen-Yu Tsai <[email protected]>
Cc Maxime Ripard <[email protected]>
---
 drivers/irqchip/irq-sunxi-nmi.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-sunxi-nmi.c +2 -2
@@ -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;
 	}
 

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