Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754766AbdIFNvE (ORCPT ); Wed, 6 Sep 2017 09:51:04 -0400 Received: from m50-132.163.com ([123.125.50.132]:57298 "EHLO m50-132.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753237AbdIFNvC (ORCPT ); Wed, 6 Sep 2017 09:51:02 -0400 X-Greylist: delayed 909 seconds by postgrey-1.27 at vger.kernel.org; Wed, 06 Sep 2017 09:51:01 EDT From: Zhenhua To: devel@acpica.org, robert.moore@intel.com, lv.zheng@intel.com, rafael.j.wysocki@intel.com, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Zhenhua Subject: [PATCH 1/1] ACPI: NULL pointer checking Date: Wed, 6 Sep 2017 21:35:22 +0800 Message-Id: <20170906133522.7884-1-lizhenhuajiyang@163.com> X-Mailer: git-send-email 2.14.1 X-CM-TRANSID: DNGowAAnuUyb+a9ZbP9vAA--.108S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Jw18Gr4xuw1UKry8Ar1UWrg_yoWkJFcE9a 97GFn7Wa1qyr40kFZxAFn2v340yFy2qFn7u3W7tF93Zr1rZryjg395Za1kWw1UWaySkFn3 uayUJr1Y9FnF9jkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUUMUqUUUUUU== X-Originating-IP: [112.232.235.160] X-CM-SenderInfo: xol2xvpqkxtyxl1d0wi6rwjhhfrp/1tbiZQRLlFWBWUwpmQAAsP Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1094 Lines: 33 These two pointers should be checked, for some broken devices they may cause system crash. Signed-off-by: Zhenhua --- drivers/acpi/acpica/nsaccess.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c index f2733f51ca8d..151abb0ef4d5 100644 --- a/drivers/acpi/acpica/nsaccess.c +++ b/drivers/acpi/acpica/nsaccess.c @@ -338,7 +338,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, return_ACPI_STATUS(AE_AML_INTERNAL); } - if (!(flags & ACPI_NS_PREFIX_IS_SCOPE)) { + if ((!prefix_node) && (!(flags & ACPI_NS_PREFIX_IS_SCOPE))) { /* * This node might not be a actual "scope" node (such as a * Device/Method, etc.) It could be a Package or other object @@ -369,7 +369,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "Null Pathname (Zero segments), Flags=%X\n", flags)); - } else { + } else if (path) { /* * Name pointer is valid (and must be in internal name format) * -- 2.14.1