Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752885AbcCJPJI (ORCPT ); Thu, 10 Mar 2016 10:09:08 -0500 Received: from torg.zytor.com ([198.137.202.12]:43188 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752373AbcCJPJE (ORCPT ); Thu, 10 Mar 2016 10:09:04 -0500 Date: Thu, 10 Mar 2016 07:06:34 -0800 From: tip-bot for Vladimir Zapolskiy Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, jason@lakedaemon.net, linux-kernel@vger.kernel.org, mingo@kernel.org, wens@csie.org, vz@mleia.com, marc.zyngier@arm.com, maxime.ripard@free-electrons.com Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, jason@lakedaemon.net, tglx@linutronix.de, hpa@zytor.com, maxime.ripard@free-electrons.com, marc.zyngier@arm.com, vz@mleia.com, wens@csie.org In-Reply-To: <1457486489-10189-1-git-send-email-vz@mleia.com> References: <1457486489-10189-1-git-send-email-vz@mleia.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/sunxi-nmi: Fix error check of of_io_request_and_map() Git-Commit-ID: cfe199afefe6201e998ddc07102fc1fdb55f196c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1688 Lines: 42 Commit-ID: cfe199afefe6201e998ddc07102fc1fdb55f196c Gitweb: http://git.kernel.org/tip/cfe199afefe6201e998ddc07102fc1fdb55f196c Author: Vladimir Zapolskiy AuthorDate: Wed, 9 Mar 2016 03:21:29 +0200 Committer: Thomas Gleixner CommitDate: Thu, 10 Mar 2016 16:03:30 +0100 irqchip/sunxi-nmi: 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: 0e841b04c829 ("irqchip/sunxi-nmi: Switch to of_io_request_and_map() from of_iomap()") Signed-off-by: Vladimir Zapolskiy Cc: Jason Cooper Cc: Marc Zyngier Cc: Chen-Yu Tsai Cc: Maxime Ripard Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1457486489-10189-1-git-send-email-vz@mleia.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-sunxi-nmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index 0820f67..668730c 100644 --- 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(struct device_node *node, 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; }