From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755591AbdIGT1A convert rfc822-to-8bit (ORCPT ); Thu, 7 Sep 2017 15:27:00 -0400 Received: from mga04.intel.com ([192.55.52.120]:25980 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751456AbdIGT06 (ORCPT ); Thu, 7 Sep 2017 15:26:58 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,360,1500966000"; d="scan'208";a="148774791" From: "Moore, Robert" To: "Moore, Robert" , Zhenhua , "devel@acpica.org" , "Zheng, Lv" , "Wysocki, Rafael J" , "lenb@kernel.org" , "linux-acpi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Schmauss, Erik" , "Box, David E" Subject: RE: [PATCH 1/1] ACPI: NULL pointer checking Thread-Topic: [PATCH 1/1] ACPI: NULL pointer checking Thread-Index: AQHTJxUPE4drQ2iZyk66ZuD4AHepe6KoEANggAGfJ3A= Date: Thu, 7 Sep 2017 19:26:56 +0000 Message-ID: <94F2FBAB4432B54E8AACC7DFDE6C92E37E60C211@ORSMSX110.amr.corp.intel.com> References: <20170906133522.7884-1-lizhenhuajiyang@163.com> <94F2FBAB4432B54E8AACC7DFDE6C92E37E60BA3F@ORSMSX110.amr.corp.intel.com> In-Reply-To: <94F2FBAB4432B54E8AACC7DFDE6C92E37E60BA3F@ORSMSX110.amr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.22.254.140] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: Devel [mailto:devel-bounces@acpica.org] On Behalf Of Moore, Robert > Sent: Wednesday, September 6, 2017 9:43 AM > To: Zhenhua ; devel@acpica.org; Zheng, Lv > ; Wysocki, Rafael J ; > lenb@kernel.org; linux-acpi@vger.kernel.org; linux- > kernel@vger.kernel.org > Subject: Re: [Devel] [PATCH 1/1] ACPI: NULL pointer checking > > > > > -----Original Message----- > > From: Zhenhua [mailto:lizhenhuajiyang@163.com] > > Sent: Wednesday, September 6, 2017 6:35 AM > > To: devel@acpica.org; Moore, Robert ; Zheng, > > Lv ; Wysocki, Rafael J > > ; lenb@kernel.org; > > linux-acpi@vger.kernel.org; linux- kernel@vger.kernel.org > > Cc: Zhenhua > > Subject: [PATCH 1/1] ACPI: NULL pointer checking > > > > 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))) { > [Moore, Robert] > > Is there an actual case where the original code failed? > > [Moore, Robert] Prefix_node is guaranteed to be valid at this point in the code. > > > /* > > * 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) { [Moore, Robert] Likewise, "path" is guaranteed to be valid at this point. > > /* > > * Name pointer is valid (and must be in internal name > > format) > > * > > -- > > 2.14.1 > > > > _______________________________________________ > Devel mailing list > Devel@acpica.org > https://lists.acpica.org/mailman/listinfo/devel