Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp6232480ybe; Tue, 17 Sep 2019 23:27:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqz3komD1MymBin9lvznmJT9gUKmJNR3QK52yqwAQOsUz0TYeUtluyu78i/c0ey/YiLBlHP9 X-Received: by 2002:a05:6402:1ade:: with SMTP id ba30mr2382859edb.304.1568788058488; Tue, 17 Sep 2019 23:27:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568788058; cv=none; d=google.com; s=arc-20160816; b=lVL2C1GUMfV48C32723i9ACl8nYxVwC+VLQFk5vsYCLTnBQww/MObVSNDdqy6+Zxq+ qBYEOR5BIQMSnoVD+ZT4Rh3sD/9GSYpLp9JdXPIIrq8z+NCz785mdu+aHEhS86hpPENZ Vw/o99IO3BsdQkRqLIrEZXad0tJCjfJzYNkFcWlThwtfZl7qSPuYWbPWt64MIuCXAXZD K4cACwLnFwoJFpwZTNy2HA2zPA59WgzusjRA0hm8I9/+Gf5uc8S/CcIxEgT8jPIDUg3H 3qBokWVc3r2aaG6wjCtevsEFh4fJOSHJ/wtjtAfhluhJYY9CPLWex2eW37mlS55bHGzu DSAw== 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=dRwAEHNch5eBEwyZsJ5OJaur7Wceh/PWzD7o0GZpuu4=; b=NRvjySoHp7biXUX+h41D9xPNv9cUug1ZoyCnqsi/Lp6VtclpUzqz0Xp8xuTpKhp6EQ y8XwaaDh0c8wN/xMxv+zl2bD0twwwjLV8TjbMVEDvdqU4pIgZDPaKgydlGjntP9izYDk yOTLy6Kilb5jsFbZG+tSkIzizQlHUKi6iupkr2EKSKdv53knLgFdOT+MuXtZQqDmAnwr H4bXFQ8Cwvobuj8zu6IQvB75tZntW303agqYKS7y11q7zsn/aIoOGmWTk+YbWYBRFut/ eIasUbVhRshGQuPWUL+NwPgvrYFwJYckjt32a2JyCFeDMSBKWfm/kN1L0afCYfGE9PNU SGhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Hayv3+kM; 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 v17si2298740ejq.5.2019.09.17.23.27.15; Tue, 17 Sep 2019 23:27:38 -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=Hayv3+kM; 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 S1729437AbfIRGWh (ORCPT + 99 others); Wed, 18 Sep 2019 02:22:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:42500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729422AbfIRGWc (ORCPT ); Wed, 18 Sep 2019 02:22:32 -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 C6712218AE; Wed, 18 Sep 2019 06:22:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568787752; bh=SleRud0PGUTD2fZfmYkNDJ7w5SHW52VvA1/PzL+j33k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hayv3+kMdPGpveIKttQrw0NgHK2I2VLkvb5uY3Ef/0uQVtJlptDZoM/gZC72X8zuy Y9ONNJP05k9DZJBL/LWCj0e5qCONRQD9jrQIKBQmYKlO97AWgPhBkwfec5/k+P0g7o XJy34JwvCBzW3qXGmop+zw5RJplf6eoUtH8HEozo= 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.19 20/50] genirq: Prevent NULL pointer dereference in resend_irqs() Date: Wed, 18 Sep 2019 08:19:03 +0200 Message-Id: <20190918061225.268093210@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190918061223.116178343@linuxfoundation.org> References: <20190918061223.116178343@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 @@ -36,6 +36,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();