Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp1184064ybj; Fri, 20 Sep 2019 06:30:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJ+0xaEmR+aTdrXwOGexiUSWV0+M1FFsoNo5N/1sYl5QjXx3jrTWOhOdl0gWrJH6aC5XtZ X-Received: by 2002:a05:6402:7c1:: with SMTP id u1mr7610705edy.198.1568986252979; Fri, 20 Sep 2019 06:30:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568986252; cv=none; d=google.com; s=arc-20160816; b=oJK0XKOg7W9aQ7g1ttX705zjBKfrOIesx6ebOF2gaqbFay8s+cZiAB5ODRa/GHAFB0 ts2F7tTNzNKC3/88jyy5h58UqnWI6MsZkmLnu3fjSzkDqmAHIWndmm5eXGjLv/Lf1dwM AT6fMgXcim1MiCv4U3Gb8Gp8/mGh6ny/4fy5vUplMgFf1E1+OiCRb6w/H9JIhYtLSxMC r8k+GOwbvfwXGfYgsMxQJb1EWkRyHLlFqohL6rXG92TG4LwESpCkRdDQt4X6SiQXL8kl uqXprGUZJIEDN8WBD0d3L8uA7Ems1eXzKcB8il5b7kA1WfZ8hyCf66af1wfO3mHJDuh/ Utmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EirOFaZqS74mFk+BbIOcKt8CTlnOd/rXIBjOGl0nLAQ=; b=soSgjvX4wwTARaNxan7mipkZXIugdE91YLDvgbV6UEwkx11Z37Hsd1cnr4O1WmXhG9 YCXNAUuHMT+jhbOpqF/lUOVkMLapRpt01tgx04S/2pFir6PBkOoiAht664WeNh26q193 k/knH/GKse8nTxWnlk14U6WQPAf3Dx8vn3aGAJnF6cmfvb8DQ0Gf1VpdC2D6eq7pCNaE 96aTYvD2GtCB/7BSfRqRARGwAP0rSYHsB8xu9tTCM8+54nrGsVkwahu9sBahoAJBVWRc LLBHlcxk+oo5n9NR2rAO7wWYcxxLc0uCRP1uaX6ud1sySBkN351oFaasP0gyu6PXSNMm S4rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AH4iU4Pc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g3si1000098ejk.387.2019.09.20.06.30.28; Fri, 20 Sep 2019 06:30:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AH4iU4Pc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392730AbfISWSq (ORCPT + 99 others); Thu, 19 Sep 2019 18:18:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:60324 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406574AbfISWSl (ORCPT ); Thu, 19 Sep 2019 18:18:41 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8714021907; Thu, 19 Sep 2019 22:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931521; bh=gooiVDH5g9HpvZWBNFw92O16E/DOwxjMhDd3ub3cRFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AH4iU4PcgefFrddLSGF2Wr/DwNrXNpq9JYZMeWbERKOgk569Pg6M5PVCC7KZvhUlz eGiGnWtYjNmUzwKWzXjCT7RzgFh+H+CrLlRJOwRJ9YtuJsVtco+f1XAi4gBtKwo0tO Y09e1P126nYgWhVyMmvbPoYZBPSizMmh9MMrIZ7w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yunfeng Ye , Thomas Gleixner , Zhiqiang Liu Subject: [PATCH 4.9 17/74] genirq: Prevent NULL pointer dereference in resend_irqs() Date: Fri, 20 Sep 2019 00:03:30 +0200 Message-Id: <20190919214806.275866439@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214800.519074117@linuxfoundation.org> References: <20190919214800.519074117@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yunfeng Ye commit eddf3e9c7c7e4d0707c68d1bb22cc6ec8aef7d4a upstream. The following crash was observed: Unable to handle kernel NULL pointer dereference at 0000000000000158 Internal error: Oops: 96000004 [#1] SMP pc : resend_irqs+0x68/0xb0 lr : resend_irqs+0x64/0xb0 ... Call trace: resend_irqs+0x68/0xb0 tasklet_action_common.isra.6+0x84/0x138 tasklet_action+0x2c/0x38 __do_softirq+0x120/0x324 run_ksoftirqd+0x44/0x60 smpboot_thread_fn+0x1ac/0x1e8 kthread+0x134/0x138 ret_from_fork+0x10/0x18 The reason for this is that the interrupt resend mechanism happens in soft interrupt context, which is a asynchronous mechanism versus other operations on interrupts. free_irq() does not take resend handling into account. Thus, the irq descriptor might be already freed before the resend tasklet is executed. resend_irqs() does not check the return value of the interrupt descriptor lookup and derefences the return value unconditionally. 1): __setup_irq irq_startup check_irq_resend // activate softirq to handle resend irq 2): irq_domain_free_irqs irq_free_descs free_desc call_rcu(&desc->rcu, delayed_free_desc) 3): __do_softirq tasklet_action resend_irqs desc = irq_to_desc(irq) desc->handle_irq(desc) // desc is NULL --> Ooops Fix this by adding a NULL pointer check in resend_irqs() before derefencing the irq descriptor. Fixes: a4633adcdbc1 ("[PATCH] genirq: add genirq sw IRQ-retrigger") Signed-off-by: Yunfeng Ye Signed-off-by: Thomas Gleixner Reviewed-by: Zhiqiang Liu Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/1630ae13-5c8e-901e-de09-e740b6a426a7@huawei.com Signed-off-by: Greg Kroah-Hartman --- kernel/irq/resend.c | 2 ++ 1 file changed, 2 insertions(+) --- a/kernel/irq/resend.c +++ b/kernel/irq/resend.c @@ -37,6 +37,8 @@ static void resend_irqs(unsigned long ar irq = find_first_bit(irqs_resend, nr_irqs); clear_bit(irq, irqs_resend); desc = irq_to_desc(irq); + if (!desc) + continue; local_irq_disable(); desc->handle_irq(desc); local_irq_enable();