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.88; helo=mga01.intel.com; envelope-from=jiaxin.wu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 9CCC521B02845 for ; Tue, 24 Jul 2018 17:30:31 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jul 2018 17:30:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,399,1526367600"; d="scan'208";a="56926475" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga007.fm.intel.com with ESMTP; 24 Jul 2018 17:30:31 -0700 Received: from fmsmsx101.amr.corp.intel.com (10.18.124.199) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 24 Jul 2018 17:30:30 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx101.amr.corp.intel.com (10.18.124.199) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 24 Jul 2018 17:30:30 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.100]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.173]) with mapi id 14.03.0319.002; Wed, 25 Jul 2018 08:30:27 +0800 From: "Wu, Jiaxin" To: Laszlo Ersek , edk2-devel-01 CC: "Fu, Siyuan" Thread-Topic: [PATCH 3/6] NetworkPkg/TlsAuthConfigDxe: replace OpenFileByDevicePath() with UefiLib API Thread-Index: AQHUHtkI2ibemBGAeEm8eNzd0YlaP6SfHucA Date: Wed, 25 Jul 2018 00:30:26 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B72741647859C@SHSMSX103.ccr.corp.intel.com> References: <20180718205043.17574-1-lersek@redhat.com> <20180718205043.17574-4-lersek@redhat.com> In-Reply-To: <20180718205043.17574-4-lersek@redhat.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMjZjYjNlYmEtZjNmNC00YTBmLTgxOGQtYWIwMGQ2ZmZiODc3IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiaE95ZlR0UmJ2SU52SEpJMFl1K3ZzMEtIOEpEZ2JCcFREMnNaa2ZYU3dNOGFDMFVrZ0JQcldxZm5wV3haTGZjMCJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 3/6] NetworkPkg/TlsAuthConfigDxe: replace OpenFileByDevicePath() with UefiLib API X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jul 2018 00:30:32 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Looks good with me. Reviewed-by: Jiaxin Wu Thanks, Jiaxin > -----Original Message----- > From: Laszlo Ersek [mailto:lersek@redhat.com] > Sent: Thursday, July 19, 2018 4:51 AM > To: edk2-devel-01 > Cc: Wu, Jiaxin ; Fu, Siyuan > Subject: [PATCH 3/6] NetworkPkg/TlsAuthConfigDxe: replace > OpenFileByDevicePath() with UefiLib API >=20 > Replace the OpenFileByDevicePath() function with EfiOpenFileByDevicePath(= ) > from UefiLib, correcting the following issues: >=20 > - imprecise comments on OpenFileByDevicePath(), > - code duplication between this module and other modules, > - local variable name "EfiSimpleFileSystemProtocol" starting with "Efi" > prefix, > - bogus "FileHandle =3D NULL" assignments, > - passing a potentially unaligned "FILEPATH_DEVICE_PATH.PathName" field > to > a protocol member function (forbidden by the UEFI spec), > - leaking "Handle1" when the device path type/subtype check fails in the > loop, > - stale SHELL_FILE_HANDLE reference in a comment. >=20 > Cc: Jiaxin Wu > Cc: Siyuan Fu > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1008 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Laszlo Ersek > --- > NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf | 1 - > NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c | 141 +----------------= --- > 2 files changed, 1 insertion(+), 141 deletions(-) >=20 > diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > index 3cfcdb9983f1..e5face7b4de5 100644 > --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > @@ -57,7 +57,6 @@ [LibraryClasses] > [Protocols] > gEfiDevicePathProtocolGuid ## PRODUCES > gEfiHiiConfigAccessProtocolGuid ## PRODUCES > - gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES >=20 > [Guids] > gTlsAuthConfigGuid ## PRODUCES ## GUID > diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c > b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c > index 31450b3e4a1b..7259c5e82f61 100644 > --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c > +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c > @@ -574,145 +574,6 @@ ON_EXIT: > return Status; > } >=20 > -/** > - This function will open a file or directory referenced by DevicePath. > - > - This function opens a file with the open mode according to the file pa= th. > The > - Attributes is valid only for EFI_FILE_MODE_CREATE. > - > - @param[in, out] FilePath On input, the device path to the file= . > - On output, the remaining device path. > - @param[out] FileHandle Pointer to the file handle. > - @param[in] OpenMode The mode to open the file with. > - @param[in] Attributes The file's file attributes. > - > - @retval EFI_SUCCESS The information was set. > - @retval EFI_INVALID_PARAMETER One of the parameters has an invalid > value. > - @retval EFI_UNSUPPORTED Could not open the file path. > - @retval EFI_NOT_FOUND The specified file could not be found= on the > - device or the file system could not b= e found on > - the device. > - @retval EFI_NO_MEDIA The device has no medium. > - @retval EFI_MEDIA_CHANGED The device has a different medium in = it > or the > - medium is no longer supported. > - @retval EFI_DEVICE_ERROR The device reported an error. > - @retval EFI_VOLUME_CORRUPTED The file system structures are > corrupted. > - @retval EFI_WRITE_PROTECTED The file or medium is write protected= . > - @retval EFI_ACCESS_DENIED The file was opened read only. > - @retval EFI_OUT_OF_RESOURCES Not enough resources were available > to open the > - file. > - @retval EFI_VOLUME_FULL The volume is full. > -**/ > -EFI_STATUS > -EFIAPI > -OpenFileByDevicePath ( > - IN OUT EFI_DEVICE_PATH_PROTOCOL **FilePath, > - OUT EFI_FILE_HANDLE *FileHandle, > - IN UINT64 OpenMode, > - IN UINT64 Attributes > - ) > -{ > - EFI_STATUS Status; > - EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *EfiSimpleFileSystemProtocol; > - EFI_FILE_PROTOCOL *Handle1; > - EFI_FILE_PROTOCOL *Handle2; > - EFI_HANDLE DeviceHandle; > - > - if ((FilePath =3D=3D NULL || FileHandle =3D=3D NULL)) { > - return EFI_INVALID_PARAMETER; > - } > - > - Status =3D gBS->LocateDevicePath ( > - &gEfiSimpleFileSystemProtocolGuid, > - FilePath, > - &DeviceHandle > - ); > - if (EFI_ERROR (Status)) { > - return Status; > - } > - > - Status =3D gBS->OpenProtocol( > - DeviceHandle, > - &gEfiSimpleFileSystemProtocolGuid, > - (VOID**)&EfiSimpleFileSystemProtocol, > - gImageHandle, > - NULL, > - EFI_OPEN_PROTOCOL_GET_PROTOCOL > - ); > - if (EFI_ERROR (Status)) { > - return Status; > - } > - > - Status =3D EfiSimpleFileSystemProtocol- > >OpenVolume(EfiSimpleFileSystemProtocol, &Handle1); > - if (EFI_ERROR (Status)) { > - FileHandle =3D NULL; > - return Status; > - } > - > - // > - // go down directories one node at a time. > - // > - while (!IsDevicePathEnd (*FilePath)) { > - // > - // For file system access each node should be a file path component > - // > - if (DevicePathType (*FilePath) !=3D MEDIA_DEVICE_PATH || > - DevicePathSubType (*FilePath) !=3D MEDIA_FILEPATH_DP > - ) { > - FileHandle =3D NULL; > - return (EFI_INVALID_PARAMETER); > - } > - // > - // Open this file path node > - // > - Handle2 =3D Handle1; > - Handle1 =3D NULL; > - > - // > - // Try to test opening an existing file > - // > - Status =3D Handle2->Open ( > - Handle2, > - &Handle1, > - ((FILEPATH_DEVICE_PATH*)*FilePath)->PathName, > - OpenMode &~EFI_FILE_MODE_CREATE, > - 0 > - ); > - > - // > - // see if the error was that it needs to be created > - // > - if ((EFI_ERROR (Status)) && (OpenMode !=3D (OpenMode > &~EFI_FILE_MODE_CREATE))) { > - Status =3D Handle2->Open ( > - Handle2, > - &Handle1, > - ((FILEPATH_DEVICE_PATH*)*FilePath)->PathName, > - OpenMode, > - Attributes > - ); > - } > - // > - // Close the last node > - // > - Handle2->Close (Handle2); > - > - if (EFI_ERROR(Status)) { > - return (Status); > - } > - > - // > - // Get the next node > - // > - *FilePath =3D NextDevicePathNode (*FilePath); > - } > - > - // > - // This is a weak spot since if the undefined SHELL_FILE_HANDLE format > changes this must change also! > - // > - *FileHandle =3D (VOID*)Handle1; > - return EFI_SUCCESS; > -} > - > /** > This function converts an input device structure to a Unicode string. >=20 > @@ -1039,7 +900,7 @@ UpdatePage( >=20 > mTlsAuthPrivateData->FileContext->FileName =3D FileName; >=20 > - OpenFileByDevicePath ( > + EfiOpenFileByDevicePath ( > &FilePath, > &mTlsAuthPrivateData->FileContext->FHandle, > EFI_FILE_MODE_READ, > -- > 2.14.1.3.gb7cf6e02401b >=20