From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754519AbdHYHOL (ORCPT ); Fri, 25 Aug 2017 03:14:11 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:34158 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754018AbdHYHOK (ORCPT ); Fri, 25 Aug 2017 03:14:10 -0400 Date: Fri, 25 Aug 2017 10:13:37 +0300 From: Dan Carpenter To: Marc Zyngier , David Daney Cc: Thomas Gleixner , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] irqdomain: check for NULL before dereferencing Message-ID: <20170825071337.g72afdd5pdqjshon@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: NeoMutt/20170609 (1.8.3) X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I reversed these two checks so we check "root_irq_data" for NULL before dereferencing it. Signed-off-by: Dan Carpenter diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index b9c688944429..e84b7056bb08 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -1505,10 +1505,10 @@ int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg) if (WARN_ON(!irq_domain_is_hierarchy(domain))) return -EINVAL; - if (domain->parent != root_irq_data->domain) + if (!root_irq_data) return -EINVAL; - if (!root_irq_data) + if (domain->parent != root_irq_data->domain) return -EINVAL; child_irq_data = kzalloc_node(sizeof(*child_irq_data), GFP_KERNEL,