From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53193 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755109AbcEBTyn (ORCPT ); Mon, 2 May 2016 15:54:43 -0400 Subject: Patch "irqchip/mxs: Fix error check of of_io_request_and_map()" has been added to the 4.5-stable tree To: vz@mleia.com, gregkh@linuxfoundation.org, jason@lakedaemon.net, kernel@pengutronix.de, linux@rempel-privat.de, marc.zyngier@arm.com, shawnguo@kernel.org, tglx@linutronix.de Cc: , From: Date: Mon, 02 May 2016 12:54:42 -0700 Message-ID: <14622188827199@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From edf8fcdc6b254236be005851af35ea5e826e7e09 Mon Sep 17 00:00:00 2001 From: Vladimir Zapolskiy Date: Wed, 9 Mar 2016 03:21:40 +0200 Subject: irqchip/mxs: Fix error check of of_io_request_and_map() From: Vladimir Zapolskiy 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 Cc: Jason Cooper Cc: Marc Zyngier Cc: Oleksij Rempel Cc: Sascha Hauer Cc: Shawn Guo 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 Signed-off-by: Greg Kroah-Hartman --- 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; } Patches currently in stable-queue which might be from vz@mleia.com 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