From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=jiaxin.wu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 66617211B63F3 for ; Thu, 17 Jan 2019 18:17:53 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jan 2019 18:17:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,489,1539673200"; d="scan'208";a="115575824" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga007.fm.intel.com with ESMTP; 17 Jan 2019 18:17:53 -0800 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 17 Jan 2019 18:17:53 -0800 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 17 Jan 2019 18:17:52 -0800 Received: from shsmsx107.ccr.corp.intel.com ([169.254.9.239]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.85]) with mapi id 14.03.0415.000; Fri, 18 Jan 2019 10:17:52 +0800 From: "Wu, Jiaxin" To: "Fu, Siyuan" , "edk2-devel@lists.01.org" CC: "Ye, Ting" , "Wu, Hao A" , "Gao, Liming" Thread-Topic: [PATCH v1 1/3] MdeModulePkg/Dhcp4Dxe: Remove unnecessary NULL pointer check. Thread-Index: AQHUrtF9YzMokkYyrkOumBCNIGzSGKW0SkhQ Date: Fri, 18 Jan 2019 02:17:52 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B727416EC65F1@SHSMSX107.ccr.corp.intel.com> References: <20190117010048.19020-1-Jiaxin.wu@intel.com> <20190117010048.19020-2-Jiaxin.wu@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMWMwZDVkZjYtMGQwNi00M2IyLTk3MDctZDNhM2UzZDdmM2VmIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiU0Y2NVd4dEZCWjRtMkFaMlU3UGFRdHpSTFNIaUZiZUdoY2x2dlRoTEltXC9UQjhPZzYyYzI1S1ZxTjk1eHR5TlEifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v1 1/3] MdeModulePkg/Dhcp4Dxe: Remove unnecessary NULL pointer check. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2019 02:17:54 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks Siyuan, I will double check that. > -----Original Message----- > From: Fu, Siyuan > Sent: Friday, January 18, 2019 10:00 AM > To: Wu, Jiaxin ; edk2-devel@lists.01.org > Cc: Ye, Ting ; Wu, Hao A ; Gao, > Liming > Subject: RE: [PATCH v1 1/3] MdeModulePkg/Dhcp4Dxe: Remove > unnecessary NULL pointer check. >=20 > Hi, Jiaxin >=20 > > -----Original Message----- > > From: Wu, Jiaxin > > Sent: Thursday, January 17, 2019 9:01 AM > > To: edk2-devel@lists.01.org > > Cc: Ye, Ting ; Fu, Siyuan ; Wu, > Hao A > > ; Gao, Liming ; Wu, Jiaxin > > > > Subject: [PATCH v1 1/3] MdeModulePkg/Dhcp4Dxe: Remove unnecessary > NULL pointer > > check. > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1469 > > > > Since the value of Instance is retrieved from the list Entry, > > it can't be the NULL pointer, so just remove the unnecessary > > check. > > > > Cc: Ye Ting > > Cc: Fu Siyuan > > Cc: Wu Hao A > > Cc: Gao Liming > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Wu Jiaxin > > --- > > MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c | 15 ++++++---- > ----- > > 1 file changed, 6 insertions(+), 9 deletions(-) > > > > diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c > > b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c > > index 98a22a77b4..04d47e0759 100644 > > --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c > > +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c > > @@ -1,9 +1,9 @@ > > /** @file > > EFI DHCP protocol implementation. > > > > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> > +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
> > This program and the accompanying materials > > are licensed and made available under the terms and conditions of the = BSD > > License > > which accompanies this distribution. The full text of the license may= be > > found at > > http://opensource.org/licenses/bsd-license.php > > > > @@ -1493,15 +1493,15 @@ DhcpOnTimerTick ( > > IN EFI_EVENT Event, > > IN VOID *Context > > ) > > { > > LIST_ENTRY *Entry; > > - LIST_ENTRY *Next; > > DHCP_SERVICE *DhcpSb; > > DHCP_PROTOCOL *Instance; > > EFI_STATUS Status; > > > > + Entry =3D NULL; > > DhcpSb =3D (DHCP_SERVICE *) Context; > > Instance =3D DhcpSb->ActiveChild; > > > > // > > // 0xffff is the maximum supported value for elapsed time according = to > RFC. > > @@ -1644,18 +1644,15 @@ DhcpOnTimerTick ( > > > > ON_EXIT: > > // > > // Iterate through all the DhcpSb Children. > > // > > - NET_LIST_FOR_EACH_SAFE (Entry, Next, &DhcpSb->Children) { > > + NET_LIST_FOR_EACH (Entry, &DhcpSb->Children) { >=20 > The DHCP Instance might be destroyed in PxeDhcpDone (it singals upper > layer that the DHCP is completed), and the NET_LIST_FOR_EACH is not > delete-safe, you should not replace it with NET_LIST_FOR_EACH. >=20 > > Instance =3D NET_LIST_USER_STRUCT (Entry, DHCP_PROTOCOL, Link); > > - > > - if ((Instance !=3D NULL) && (Instance->Token !=3D NULL)) { > > - Instance->Timeout--; > > - if (Instance->Timeout =3D=3D 0) { > > - PxeDhcpDone (Instance); > > - } > > + Instance->Timeout--; > > + if (Instance->Timeout =3D=3D 0) { > > + PxeDhcpDone (Instance); > > } > > } > > > > return ; > > > > -- > > 2.17.1.windows.2