From nobody Thu Oct 31 23:53:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=outlook.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1525562274712459.65770209932; Sat, 5 May 2018 16:17:54 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 57D2F203B8BFF; Sat, 5 May 2018 16:17:53 -0700 (PDT) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069061.outbound.protection.outlook.com [40.92.69.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BE532203B8BF1 for ; Sat, 5 May 2018 16:17:51 -0700 (PDT) Received: from HE1EUR02FT062.eop-EUR02.prod.protection.outlook.com (10.152.10.57) by HE1EUR02HT111.eop-EUR02.prod.protection.outlook.com (10.152.11.233) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.13; Sat, 5 May 2018 23:17:48 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com (10.152.10.52) by HE1EUR02FT062.mail.protection.outlook.com (10.152.11.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.13 via Frontend Transport; Sat, 5 May 2018 23:17:48 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com ([fe80::7c79:584b:2e12:783e]) by VI1PR0801MB1790.eurprd08.prod.outlook.com ([fe80::7c79:584b:2e12:783e%17]) with mapi id 15.20.0715.024; Sat, 5 May 2018 23:17:48 +0000 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.92.69.61; helo=eur02-ve1-obe.outbound.protection.outlook.com; envelope-from=marvin.haeuser@outlook.com; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=opAzvj+7TkevIpN6PZbgNzffiZou8AbmQS6RvzDyk5Y=; b=RnxBZoDxgUWnM0q3xsfaoYufoaNpVtiI2u7ssjNI+cp+BNLSLuXPTDpoxLOHHH0zeuLvFJFdvIgO397t/UGwSc417efPRMxrf9dvlPP0hlqLtHAFXhUR6dee01o6iCBnzB/KRBe41s25+8DhkWeKWe9Fj+D9RBv7W+GMVWPC1JxCtEFyTMAovb08GItWPiz5ZOqSKgkat+jzCdI7v9k54awfXNVSthLUCfijChvidwM//MzA2a0i5qQANwLIGx4dk+nOFq6inR6VSUVQPddzqUIVLS8aUjYQSu6/spp52scxllqiORPWZCVmKKj7xH4v5ijrtecpVhpOxLTqHaLbsw== From: =?iso-8859-1?Q?Marvin_H=E4user?= To: "edk2-devel@lists.01.org" Thread-Topic: [PATCH] MdePkg/UefiFileHandleLib: Fix the Root directory determination. Thread-Index: AQHT5MdI7k69IhY5JE6cCVOCJHm/zw== Date: Sat, 5 May 2018 23:17:48 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR02CA0019.eurprd02.prod.outlook.com (2603:10a6:208:3e::32) To VI1PR0801MB1790.eurprd08.prod.outlook.com (2603:10a6:800:5b::15) x-incomingtopheadermarker: OriginalChecksum:C2C722DC0D9F9A86AE63E465BE8B806CD407ADACA8C88DA3429AD8488B03E4E0; UpperCasedChecksum:9B8481AB203F2016FD49217D5F357B8D6F87E65BEF571F194953EA67DE016F50; SizeAsReceived:7505; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [X6qt0xKYR1RPb28b1FKJkqcCN7Pw8YSu] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR02HT111; 7:jnCwETEi35fJxoyzKmctT7aqHJr0T6I0OhKrykb4lMX7p9PKyo+3R54kcE5qm2XbNWTGO+/aluGhbkcLGsYx7XQbFB5cO7IQbx/G6pxMDt/F/pCeHY2I/i5rIfZQNtnprBsCSjGqg3ULsKsTg4BvvuLFPmSuGLXE3AZEjm08jEwlAMoYMcjSZ8v6EjKA0F3+raO+UwimcX5DjWocBeFPFm9eu6HVx3Emq2E/0jLlKOMjyUMao4FK/PTMrvm/jbwS x-incomingheadercount: 48 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:HE1EUR02HT111; x-ms-traffictypediagnostic: HE1EUR02HT111: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:HE1EUR02HT111; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR02HT111; x-forefront-prvs: 0663390E1B x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:HE1EUR02HT111; H:VI1PR0801MB1790.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:; x-microsoft-antispam-message-info: ZZMFPq/7pegbigvgUHvmUGOTZIv53JzrMg6jnsaYYgC7fSHZ7nsGTBg2kV3EMoTQYvIDdw0h7n2sOZIpWmoJBwbqc0W6b30dSnLDeM8A9wXjFN0UQ/+FHd62a3ReHQOXpFtclstr5aCDOD7PkxurghGtRVPITHvUwsHzx00JaEOFz+di3EhufcnmU027WOse MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 7fe79de0-b6dd-4bbc-eaff-08d5b2de6a5d X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-Network-Message-Id: 7fe79de0-b6dd-4bbc-eaff-08d5b2de6a5d X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2018 23:17:48.8410 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT111 Subject: [edk2] [PATCH] MdePkg/UefiFileHandleLib: Fix the Root directory determination. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "michael.d.kinney@intel.com" , "liming.gao@intel.com" Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The current implementation of the FileHandleGetFileName() function assumes that the Root directory always has the FileName '\0'. However, the only requirement the UEFI specification defines is that a prepended '\\' must be supported to access files and folders relative to the Root directory. This patch removes this assumption and supports constructing valid paths for any value of FileName for the Root Directory. In practice, this fixes compatibility issues with File System drivers that report '\\' as the FileName of the Root directory, which currently is both generating an invalid path ("\\\\") and resulting in an EFI_NOT_FOUND result from the CurrentHandle->Open() call. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marvin Haeuser --- MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c | 29 ++++++++++++++--= ---- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c b/MdePkg/= Library/UefiFileHandleLib/UefiFileHandleLib.c index 57aad77bc135..820801422996 100644 --- a/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c +++ b/MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.c @@ -1,7 +1,7 @@ /** @file Provides interface to EFI_FILE_HANDLE functionality. =20 - Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -820,10 +820,25 @@ FileHandleGetFileName ( Status =3D EFI_OUT_OF_RESOURCES; break; } else { + // + // Prepare to move to the parent directory. + // Also determine whether CurrentHandle refers to the Root directo= ry. + // + Status =3D CurrentHandle->Open (CurrentHandle, &NextHigherHandle, = L"..", EFI_FILE_MODE_READ, 0); // // We got info... do we have a name? if yes precede the current pa= th with it... // - if (StrLen (FileInfo->FileName) =3D=3D 0) { + if ((StrLen (FileInfo->FileName) =3D=3D 0) || EFI_ERROR (Status)) { + // + // Both FileInfo->FileName being '\0' and EFI_ERROR() suggest th= at + // CurrentHandle refers to the Root directory. As this loop ens= ures + // FullFileName is starting with '\\' at all times, signal succe= ss + // and exit the loop. + // While FileInfo->FileName could theoretically be a value other= than + // '\0' or '\\', '\\' is guaranteed to be supported by the + // specification and hence its value can safely be ignored. + // + Status =3D EFI_SUCCESS; if (*FullFileName =3D=3D NULL) { ASSERT((*FullFileName =3D=3D NULL && Size =3D=3D 0) || (*FullF= ileName !=3D NULL)); *FullFileName =3D StrnCatGrowLeft(FullFileName, &Size, L"\\", = 0); @@ -841,15 +856,11 @@ FileHandleGetFileName ( FreePool(FileInfo); } } - // - // Move to the parent directory - // - Status =3D CurrentHandle->Open (CurrentHandle, &NextHigherHandle, L"= ..", EFI_FILE_MODE_READ, 0); - if (EFI_ERROR (Status)) { - break; - } =20 FileHandleClose(CurrentHandle); + // + // Move to the parent directory + // CurrentHandle =3D NextHigherHandle; } } else if (Status =3D=3D EFI_NOT_FOUND) { --=20 2.17.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel