From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 902DDC43217 for ; Mon, 28 Mar 2022 11:28:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241385AbiC1LaZ (ORCPT ); Mon, 28 Mar 2022 07:30:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241747AbiC1LYK (ORCPT ); Mon, 28 Mar 2022 07:24:10 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 361F43335A; Mon, 28 Mar 2022 04:22:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D9D86B81055; Mon, 28 Mar 2022 11:22:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0481C340ED; Mon, 28 Mar 2022 11:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648466540; bh=eIRS4p7zo1cUJrb/T2hKO+d1LleZqfjg6q8qyY7uGqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xs3grpBzhvWOH60ihMaX0nTjWJRv64ER4xNKd2asQKg/nJxAtrT/k+R4BmtD67fpl iMJ8jY8jMnpUMSPOBTk+FskHj69NIsKIzL51iTv2kNm+69HR0VLxxkFXlp6AP2EtEB Ob7DwC+cVIga1mTJLSUbU1FwXeBagvMVVRjhAJi4K23UtdVkcO0CDnb3EBT5Pn14bJ ER2AuXkmXox37o32tSFitWbAZ6h6ku8t/UqQehuCZJ3LQHfwAIIsWTqHIjQfD1PWSK VdjWo7TimM7en0Ndw3ZtsU3HoV8qt+mPn2C2gFVYTFdyZe/mB6WRCCYGti4Smit6kf VuoQNFQOE8dcw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Rafael J. Wysocki" , Hans de Goede , Sasha Levin , robert.moore@intel.com, linux-acpi@vger.kernel.org, devel@acpica.org Subject: [PATCH AUTOSEL 5.15 21/29] ACPICA: Avoid walking the ACPI Namespace if it is not there Date: Mon, 28 Mar 2022 07:21:23 -0400 Message-Id: <20220328112132.1555683-21-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328112132.1555683-1-sashal@kernel.org> References: <20220328112132.1555683-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Rafael J. Wysocki" [ Upstream commit 0c9992315e738e7d6e927ef36839a466b080dba6 ] ACPICA commit b1c3656ef4950098e530be68d4b589584f06cddc Prevent acpi_ns_walk_namespace() from crashing when called with start_node equal to ACPI_ROOT_OBJECT if the Namespace has not been instantiated yet and acpi_gbl_root_node is NULL. For instance, this can happen if the kernel is run with "acpi=off" in the command line. Link: https://github.com/acpica/acpica/commit/b1c3656ef4950098e530be68d4b589584f06cddc Link: https://lore.kernel.org/linux-acpi/CAJZ5v0hJWW_vZ3wwajE7xT38aWjY7cZyvqMJpXHzUL98-SiCVQ@mail.gmail.com/ Reported-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/acpica/nswalk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c index 915c2433463d..e7c30ce06e18 100644 --- a/drivers/acpi/acpica/nswalk.c +++ b/drivers/acpi/acpica/nswalk.c @@ -169,6 +169,9 @@ acpi_ns_walk_namespace(acpi_object_type type, if (start_node == ACPI_ROOT_OBJECT) { start_node = acpi_gbl_root_node; + if (!start_node) { + return_ACPI_STATUS(AE_NO_NAMESPACE); + } } /* Null child means "get first node" */ -- 2.34.1