From nobody Tue Apr 16 07:40:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+73263+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73263+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1616660104; cv=none; d=zohomail.com; s=zohoarc; b=dBLCbUrldCT7IvzzT8regJmzjrsCFFXhM8CxlFFGKK9BHvGmbmvqLwBHFBEWWOcZhdZeevk7d5F1B3/MyTJFMTwaHlwVTbFejqeiQtmm2zaob7hJSmUKfcjJVYj7FNwEf0tzreZr6c/kOicf/u/gGMdlbCQbm9MaS/VHi7aWj0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616660104; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=jgL4ScXIbRyQEQzgLQ4ouTIEMGGhWMk9pY9k0IEP2sQ=; b=R4qztVLHgwTsV6SFm9dpInxmL1QSqPY+J8dKcI6fQclF4ALeG/TiIscDmbq/sZ2sKTNkFCz4L89qctOSsR5RH4n1n7RsnJFmGGUxqXyOBHr3qAkOAGEJBWsra9BXd5OhJzGVNYk8RIo2fC1XgB5eDM93X9m5+HWXY5oXpj4ksy0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73263+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1616660104579443.1958130949014; Thu, 25 Mar 2021 01:15:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id VYPvYY1788612x1XW9g9xkp0; Thu, 25 Mar 2021 01:15:04 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web09.5117.1616660103310609890 for ; Thu, 25 Mar 2021 01:15:03 -0700 IronPort-SDR: TWnry4Vq5zby2osHf7yJcqZLVHge9U3mCUlafKDiz1atPh+p1xEnOlvwCj0ypI3YBrsU/F2Oi0 SBKor9bXoFNg== X-IronPort-AV: E=McAfee;i="6000,8403,9933"; a="187577500" X-IronPort-AV: E=Sophos;i="5.81,277,1610438400"; d="scan'208";a="187577500" X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2021 01:15:01 -0700 IronPort-SDR: OMfvCXrZTfJ0iUClyfHvajP1oNO7gvaxku8nN6smmSRRgPYSWHqpdIJI1yoUC6N6V41I+FFoXo ChJGdbAbcz0Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,277,1610438400"; d="scan'208";a="514521582" X-Received: from chinghux-desk1.gar.corp.intel.com ([10.5.215.141]) by fmsmga001.fm.intel.com with ESMTP; 25 Mar 2021 01:15:00 -0700 From: "GregX Yeh" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [edk2-devel] [PATCH] [edk2-staging] BaseTools/Fmmt: Fix rebuild FFS lost dependency section. Date: Thu, 25 Mar 2021 16:14:52 +0800 Message-Id: <20210325081452.5104-1-gregx.yeh@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,gregx.yeh@intel.com X-Gm-Message-State: VI3vPDwFl0NNzuLaw7DREDmux1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1616660104; bh=ezbCiLwz1/YiWtfzduN/ZU8A4XGFKHFqxs3JuU1jGtE=; h=Cc:Date:From:Reply-To:Subject:To; b=u+Ol0R2L1a8EX2J1Nyq1AcRk7VecpON9XK8bauULkfvhgru1aqOV29VVJ5ltK/ShZ4p tFNeMb9HoIkX31sUll4S7/10v5owGc7NTOkVhd+DfBM33xTVki+vr25Eua8EYELrq/TIJ CaFQJ7PvWTnUWz+Bv3GpAm7arjju648kraQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D3261 Dependency section data lost when rebuild FFS. Add pei dxe smm dependency section to FFS and Encap_INFO_DATA structure. Restore dependency section when build FFS. Cc: Bob Feng Cc: Liming Gao Signed-off-by: GregX Yeh Reviewed-by: Bob Feng --- BaseTools/Source/C/FMMT/FirmwareModuleManagement.h | 28 +- BaseTools/Source/C/FMMT/FmmtLib.c | 443 +++++++++++++++--= ---- 2 files changed, 334 insertions(+), 137 deletions(-) diff --git a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.h b/BaseTools= /Source/C/FMMT/FirmwareModuleManagement.h index 9d09c9160a..84ccfaed1d 100644 --- a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.h +++ b/BaseTools/Source/C/FMMT/FirmwareModuleManagement.h @@ -2,7 +2,7 @@ =20 Structures and functions declaration. =20 - Copyright (c) 2019, Intel Corporation. All rights reserved.
+ Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -195,7 +195,7 @@ typedef struct { // UI Name for this FFS file, if has. // CHAR16 UiName[_MAX_PATH]; - UINT32 UiNameSize; + UINT32 UiNameSize; // // Total section number in this FFS. // @@ -223,8 +223,12 @@ typedef struct { UINT32 Offset; UINT8 FvLevel; EFI_GUID GuidName; - UINT8 *Depex; - UINT32 DepexLen; + UINT8 *PeiDepex; + UINT32 PeiDepexLen; + UINT8 *DxeDepex; + UINT32 DxeDepexLen; + UINT8 *SmmDepex; + UINT32 SmmDepexLen; BOOLEAN IsHandle; BOOLEAN IsFvStart; BOOLEAN IsFvEnd; @@ -259,8 +263,12 @@ typedef struct __ENCAP_INFO_DATA{ =20 CHAR16 UiName[_MAX_PATH]; UINT32 UiNameSize; - UINT8 *Depex; - UINT32 DepexLen; + UINT8 *PeiDepex; + UINT32 PeiDepexLen; + UINT8 *DxeDepex; + UINT32 DxeDepexLen; + UINT8 *SmmDepex; + UINT32 SmmDepexLen; =20 // // Next node. @@ -281,8 +289,12 @@ typedef struct _FFS_INFOMATION{ BOOLEAN IsFFS; CHAR16 UiName[_MAX_PATH]; UINT32 UiNameSize; - UINT8 *Depex; - UINT32 DepexLen; + UINT8 *PeiDepex; + UINT32 PeiDepexLen; + UINT8 *DxeDepex; + UINT32 DxeDepexLen; + UINT8 *SmmDepex; + UINT32 SmmDepexLen; BOOLEAN FfsFoundFlag; struct _FFS_INFOMATION *Next; } FFS_INFORMATION; diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c b/BaseTools/Source/C/FMMT/Fm= mtLib.c index 9a9ba8b56f..fa77ed7317 100644 --- a/BaseTools/Source/C/FMMT/FmmtLib.c +++ b/BaseTools/Source/C/FMMT/FmmtLib.c @@ -164,8 +164,12 @@ LibInitializeFvStruct ( Fv->FfsAttuibutes[Index].IsLeaf =3D TRUE; Fv->FfsAttuibutes[Index].Level =3D 0xFF; Fv->FfsAttuibutes[Index].TotalSectionNum =3D 0; - Fv->FfsAttuibutes[Index].Depex =3D NULL; - Fv->FfsAttuibutes[Index].DepexLen =3D 0; + Fv->FfsAttuibutes[Index].PeiDepex =3D NULL; + Fv->FfsAttuibutes[Index].PeiDepexLen =3D 0; + Fv->FfsAttuibutes[Index].DxeDepex =3D NULL; + Fv->FfsAttuibutes[Index].DxeDepexLen =3D 0; + Fv->FfsAttuibutes[Index].SmmDepex =3D NULL; + Fv->FfsAttuibutes[Index].SmmDepexLen =3D 0; Fv->FfsAttuibutes[Index].IsHandle =3D FALSE; Fv->FfsAttuibutes[Index].IsFvStart =3D FALSE; Fv->FfsAttuibutes[Index].IsFvEnd =3D FALSE; @@ -835,6 +839,7 @@ LibParseSection ( CHAR8 *ToolOutputFileName; BOOLEAN HasUiSection; BOOLEAN FirstInFlag; + UINT32 KeepFfsCount; =20 DataOffset =3D 0; GuidAttr =3D 0; @@ -871,6 +876,7 @@ LibParseSection ( LargeHeaderOffset =3D 0; HasUiSection =3D FALSE; FirstInFlag =3D TRUE; + KeepFfsCount =3D *FfsCount; =20 =20 while (ParsedLength < BufferLength) { @@ -945,9 +951,13 @@ LibParseSection ( LocalEncapData->Data =3D NULL; LocalEncapData->FvExtHeader =3D NULL; LocalEncapData->NextNode =3D NULL; - LocalEncapData->RightNode =3D NULL; - LocalEncapData->Depex =3D NULL; - LocalEncapData->DepexLen =3D 0; + LocalEncapData->RightNode =3D NULL; + LocalEncapData->PeiDepex =3D NULL; + LocalEncapData->PeiDepexLen =3D 0; + LocalEncapData->DxeDepex =3D NULL; + LocalEncapData->DxeDepexLen =3D 0; + LocalEncapData->SmmDepex =3D NULL; + LocalEncapData->SmmDepexLen =3D 0; LocalEncapData->UiNameSize =3D 0; LocalEncapData->FvId =3D *FvCount; } @@ -972,13 +982,19 @@ LibParseSection ( if ((memcmp(&CurrentFv->FfsAttuibutes[*FfsCount - 1].G= uidName, &(LocalEncapDataTemp->FvExtHeader->FvName), sizeof(EFI_GUID)) =3D= =3D 0)) { memcpy(LocalEncapDataTemp->UiName, CurrentFv->FfsA= ttuibutes[*FfsCount - 1].UiName, _MAX_PATH); LocalEncapDataTemp->UiNameSize =3D CurrentFv->FfsA= ttuibutes[*FfsCount - 1].UiNameSize; - LocalEncapDataTemp->DepexLen =3D CurrentFv->FfsAtt= uibutes[*FfsCount - 1].DepexLen; - LocalEncapDataTemp->Depex =3D malloc (LocalEncapDa= taTemp->DepexLen); - if (LocalEncapDataTemp->Depex =3D=3D NULL) { + LocalEncapDataTemp->PeiDepexLen =3D CurrentFv->Ffs= Attuibutes[*FfsCount - 1].PeiDepexLen; + LocalEncapDataTemp->PeiDepex =3D malloc (LocalEnca= pDataTemp->PeiDepexLen); + LocalEncapDataTemp->DxeDepexLen =3D CurrentFv->Ffs= Attuibutes[*FfsCount - 1].DxeDepexLen; + LocalEncapDataTemp->DxeDepex =3D malloc (LocalEnca= pDataTemp->DxeDepexLen); + LocalEncapDataTemp->SmmDepexLen =3D CurrentFv->Ffs= Attuibutes[*FfsCount - 1].SmmDepexLen; + LocalEncapDataTemp->SmmDepex =3D malloc (LocalEnca= pDataTemp->SmmDepexLen); + if ((LocalEncapDataTemp->SmmDepex =3D=3D NULL) || = (LocalEncapDataTemp->SmmDepex =3D=3D NULL) || (LocalEncapDataTemp->SmmDepex= =3D=3D NULL)){ Error(NULL, 0, 4001, "Resource: Memory can't b= e allocated", NULL); return EFI_ABORTED; } - memcpy(LocalEncapDataTemp->Depex, CurrentFv->FfsAt= tuibutes[*FfsCount - 1].Depex, LocalEncapDataTemp->DepexLen); + memcpy(LocalEncapDataTemp->PeiDepex, CurrentFv->Ff= sAttuibutes[*FfsCount - 1].PeiDepex, LocalEncapDataTemp->PeiDepexLen); + memcpy(LocalEncapDataTemp->DxeDepex, CurrentFv->Ff= sAttuibutes[*FfsCount - 1].DxeDepex, LocalEncapDataTemp->DxeDepexLen); + memcpy(LocalEncapDataTemp->SmmDepex, CurrentFv->Ff= sAttuibutes[*FfsCount - 1].SmmDepex, LocalEncapDataTemp->SmmDepexLen); } } } @@ -1257,8 +1273,12 @@ LibParseSection ( =20 LocalEncapData->Level =3D Level; LocalEncapData->Type =3D FMMT_ENCAP_TREE_GUIDED_SECTION; - LocalEncapData->Depex =3D NULL; - LocalEncapData->DepexLen =3D 0; + LocalEncapData->PeiDepex =3D NULL; + LocalEncapData->PeiDepexLen =3D 0; + LocalEncapData->DxeDepex =3D NULL; + LocalEncapData->DxeDepexLen =3D 0; + LocalEncapData->SmmDepex =3D NULL; + LocalEncapData->SmmDepexLen =3D 0; LocalEncapData->UiNameSize =3D 0; LocalEncapData->FvId =3D *FvCount; // @@ -1290,8 +1310,12 @@ LibParseSection ( LocalEncapData =3D LocalEncapData->RightNode; LocalEncapData->Level =3D Level; LocalEncapData->Type =3D FMMT_ENCAP_TREE_GUIDED_SECTION; - LocalEncapData->Depex =3D NULL; - LocalEncapData->DepexLen =3D 0; + LocalEncapData->PeiDepex =3D NULL; + LocalEncapData->PeiDepexLen =3D 0; + LocalEncapData->DxeDepex =3D NULL; + LocalEncapData->DxeDepexLen =3D 0; + LocalEncapData->SmmDepex =3D NULL; + LocalEncapData->SmmDepexLen =3D 0; LocalEncapData->UiNameSize =3D 0; LocalEncapData->FvId =3D *FvCount; // @@ -1608,25 +1632,25 @@ LibParseSection ( NumberOfSections ++; CurrentFv->FfsAttuibutes[*FfsCount].Level =3D Level; HasDepexSection =3D TRUE; - CurrentFv->FfsAttuibutes[*FfsCount].Depex =3D malloc (SectionLength); - memcpy(CurrentFv->FfsAttuibutes[*FfsCount].Depex, Ptr, SectionLength= ); - CurrentFv->FfsAttuibutes[*FfsCount].DepexLen =3D SectionLength; + CurrentFv->FfsAttuibutes[*FfsCount].PeiDepex =3D malloc (SectionLeng= th); + memcpy(CurrentFv->FfsAttuibutes[*FfsCount].PeiDepex, Ptr, SectionLen= gth); + CurrentFv->FfsAttuibutes[*FfsCount].PeiDepexLen =3D SectionLength; break; case EFI_SECTION_DXE_DEPEX: NumberOfSections ++; CurrentFv->FfsAttuibutes[*FfsCount].Level =3D Level; HasDepexSection =3D TRUE; - CurrentFv->FfsAttuibutes[*FfsCount].Depex =3D malloc (SectionLength); - memcpy(CurrentFv->FfsAttuibutes[*FfsCount].Depex, Ptr, SectionLength= ); - CurrentFv->FfsAttuibutes[*FfsCount].DepexLen =3D SectionLength; + CurrentFv->FfsAttuibutes[*FfsCount].DxeDepex =3D malloc (SectionLeng= th); + memcpy(CurrentFv->FfsAttuibutes[*FfsCount].DxeDepex, Ptr, SectionLen= gth); + CurrentFv->FfsAttuibutes[*FfsCount].DxeDepexLen =3D SectionLength; break; case EFI_SECTION_SMM_DEPEX: NumberOfSections ++; CurrentFv->FfsAttuibutes[*FfsCount].Level =3D Level; HasDepexSection =3D TRUE; - CurrentFv->FfsAttuibutes[*FfsCount].Depex =3D malloc (SectionLength); - memcpy(CurrentFv->FfsAttuibutes[*FfsCount].Depex, Ptr, SectionLength= ); - CurrentFv->FfsAttuibutes[*FfsCount].DepexLen =3D SectionLength; + CurrentFv->FfsAttuibutes[*FfsCount].SmmDepex =3D malloc (SectionLeng= th); + memcpy(CurrentFv->FfsAttuibutes[*FfsCount].SmmDepex, Ptr, SectionLen= gth); + CurrentFv->FfsAttuibutes[*FfsCount].SmmDepexLen =3D SectionLength; break; =20 case EFI_SECTION_USER_INTERFACE: @@ -1686,6 +1710,10 @@ LibParseSection ( CurrentFv->FfsAttuibutes[*FfsCount].UiNameSize =3D UINameSize; } =20 + if (IsFfs) { + memcpy (CurrentFv->FfsAttuibutes[KeepFfsCount].UiName, UIName, UIN= ameSize); + CurrentFv->FfsAttuibutes[KeepFfsCount].UiNameSize =3D UINameSize; + } HasDepexSection =3D FALSE; free(UIName); UINameSize =3D 0; @@ -1983,8 +2011,12 @@ LibGetFileInfo ( LocalEncapData->Level =3D Level; LocalEncapData->Type =3D FMMT_ENCAP_TREE_FFS; LocalEncapData->FvExtHeader =3D NULL; - LocalEncapData->Depex =3D NULL; - LocalEncapData->DepexLen =3D 0; + LocalEncapData->PeiDepex =3D NULL; + LocalEncapData->PeiDepexLen =3D 0; + LocalEncapData->DxeDepex =3D NULL; + LocalEncapData->DxeDepexLen =3D 0; + LocalEncapData->SmmDepex =3D NULL; + LocalEncapData->SmmDepexLen =3D 0; LocalEncapData->UiNameSize =3D 0; LocalEncapData->FvId =3D *FvCount; // @@ -2031,8 +2063,12 @@ LibGetFileInfo ( LocalEncapData->Level =3D Level; LocalEncapData->Type =3D FMMT_ENCAP_TREE_FFS; LocalEncapData->FvExtHeader =3D NULL; - LocalEncapData->Depex =3D NULL; - LocalEncapData->DepexLen =3D 0; + LocalEncapData->PeiDepex =3D NULL; + LocalEncapData->PeiDepexLen =3D 0; + LocalEncapData->DxeDepex =3D NULL; + LocalEncapData->DxeDepexLen =3D 0; + LocalEncapData->SmmDepex =3D NULL; + LocalEncapData->SmmDepexLen =3D 0; LocalEncapData->UiNameSize =3D 0; LocalEncapData->FvId =3D *FvCount; // @@ -2235,8 +2271,12 @@ LibGetFvInfo ( } =20 CurrentFv->EncapData->FvExtHeader =3D NULL; - CurrentFv->EncapData->Depex =3D NULL; - CurrentFv->EncapData->DepexLen =3D 0; + CurrentFv->EncapData->PeiDepex =3D NULL; + CurrentFv->EncapData->PeiDepexLen =3D 0; + CurrentFv->EncapData->DxeDepex =3D NULL; + CurrentFv->EncapData->DxeDepexLen =3D 0; + CurrentFv->EncapData->SmmDepex =3D NULL; + CurrentFv->EncapData->SmmDepexLen =3D 0; CurrentFv->EncapData->UiNameSize =3D 0; CurrentFv->EncapData->Level =3D Level; CurrentFv->EncapData->Type =3D FMMT_ENCAP_TREE_FV; @@ -2292,8 +2332,12 @@ LibGetFvInfo ( LocalEncapData->Type =3D FMMT_ENCAP_TREE_FV; LocalEncapData->Data =3D (EFI_FIRMWARE_VOLUME_HEADER *) malloc (siz= eof (EFI_FIRMWARE_VOLUME_HEADER)); LocalEncapData->FvExtHeader =3D NULL; - LocalEncapData->Depex =3D NULL; - LocalEncapData->DepexLen =3D 0; + LocalEncapData->PeiDepex =3D NULL; + LocalEncapData->PeiDepexLen =3D 0; + LocalEncapData->DxeDepex =3D NULL; + LocalEncapData->DxeDepexLen =3D 0; + LocalEncapData->SmmDepex =3D NULL; + LocalEncapData->SmmDepexLen =3D 0; LocalEncapData->UiNameSize =3D 0; LocalEncapData->FvId =3D *FvCount; if (LocalEncapData->Data =3D=3D NULL) { @@ -4255,8 +4299,12 @@ LibEncapNewFvFile( OutputFileNameList->ParentLevel =3D 0; OutputFileNameList->Next =3D NULL; OutputFileNameList->UiNameSize =3D 0; - OutputFileNameList->Depex =3D NULL; - OutputFileNameList->DepexLen =3D 0; + OutputFileNameList->PeiDepex =3D NULL; + OutputFileNameList->PeiDepexLen =3D 0; + OutputFileNameList->DxeDepex =3D NULL; + OutputFileNameList->DxeDepexLen =3D 0; + OutputFileNameList->SmmDepex =3D NULL; + OutputFileNameList->SmmDepexLen =3D 0; OutputFileNameList->FfsFoundFlag =3D FALSE; =20 ChildFileNameList =3D (FFS_INFORMATION *)malloc(sizeof(FFS_INFORMATION)); @@ -4270,8 +4318,12 @@ LibEncapNewFvFile( ChildFileNameList->Next =3D NULL; ChildFileNameList->IsFFS =3D FALSE; ChildFileNameList->UiNameSize =3D 0; - ChildFileNameList->Depex =3D NULL; - ChildFileNameList->DepexLen =3D 0; + ChildFileNameList->PeiDepex =3D NULL; + ChildFileNameList->PeiDepexLen =3D 0; + ChildFileNameList->DxeDepex =3D NULL; + ChildFileNameList->DxeDepexLen =3D 0; + ChildFileNameList->SmmDepex =3D NULL; + ChildFileNameList->SmmDepexLen =3D 0; ChildFileNameList->FfsFoundFlag =3D FALSE; // // Encapsulate from the lowest FFS file level. @@ -4663,8 +4715,12 @@ LibEncapNewFvFile( if (EncapFvIndex > 0) { memcpy(OutputFileNameList->UiName,FvInFd->FfsAttuibutes[EncapF= vIndex - 1].UiName, FvInFd->FfsAttuibutes[EncapFvIndex - 1].UiNameSize); OutputFileNameList->UiNameSize =3D FvInFd->FfsAttuibutes[Encap= FvIndex - 1].UiNameSize; - OutputFileNameList->Depex =3D FvInFd->FfsAttuibutes[EncapFvInd= ex - 1].Depex; - OutputFileNameList->DepexLen =3D FvInFd->FfsAttuibutes[EncapFv= Index - 1].DepexLen; + OutputFileNameList->PeiDepex =3D FvInFd->FfsAttuibutes[EncapFv= Index - 1].PeiDepex; + OutputFileNameList->PeiDepexLen =3D FvInFd->FfsAttuibutes[Enca= pFvIndex - 1].PeiDepexLen; + OutputFileNameList->DxeDepex =3D FvInFd->FfsAttuibutes[EncapFv= Index - 1].DxeDepex; + OutputFileNameList->DxeDepexLen =3D FvInFd->FfsAttuibutes[Enca= pFvIndex - 1].DxeDepexLen; + OutputFileNameList->SmmDepex =3D FvInFd->FfsAttuibutes[EncapFv= Index - 1].SmmDepex; + OutputFileNameList->SmmDepexLen =3D FvInFd->FfsAttuibutes[Enca= pFvIndex - 1].SmmDepexLen; OutputFileNameList->FfsFoundFlag =3D FfsFoundFlag; OutputFileNameList->FvId =3D FvInFd->FfsAttuibutes[EncapFvInde= x - 1].FvId; OutputFileNameList->ParentLevel =3D ParentLevel - 1; @@ -4683,13 +4739,13 @@ LibEncapNewFvFile( } while (LocalEncapData->NextNode !=3D NULL) { if (LocalEncapData->Level =3D=3D ParentLevel) { - for(;LocalEncapData->NextNode !=3D NULL;) { - if(LocalEncapData->FvExtHeader !=3D NULL) { - break; - } - LocalEncapData =3D LocalEncapData->NextNode; - } - break; + for(;LocalEncapData->NextNode !=3D NULL;) { + if(LocalEncapData->FvExtHeader !=3D NULL) { + break; + } + LocalEncapData =3D LocalEncapData->NextNode; + } + break; } LocalEncapData =3D LocalEncapData->NextNode; } @@ -4701,100 +4757,225 @@ LibEncapNewFvFile( return EFI_ABORTED; } =20 - if (OutputFileNameList->UiNameSize > 0) { - TmpFileName =3D LibFilenameStrExtended(strrchr(GenTempFile (= ), OS_SEP), TemDir, "tmp"); - TmpFile =3D fopen(TmpFileName, "wb+"); - if (TmpFile =3D=3D NULL) { - Error("FMMT", 0, 0004, "Could not open tmp file %s to sto= re UI section information! \n", ""); - free (OutputFileNameList); - free (ChildFileNameList); - return EFI_ABORTED; + for (Id =3D 0; Id <=3D FvInFd->FfsNumbers; Id++) { + if ((memcmp(&FvInFd->FfsAttuibutes[Id].GuidName, &(LocalEncapD= ata->FvExtHeader->FvName), sizeof(EFI_GUID)) =3D=3D 0)){ + if (&FvInFd->FfsAttuibutes[Id].UiNameSize > 0){ + OutputFileNameList->UiNameSize =3D FvInFd->FfsAttuibutes[I= d].UiNameSize; + memcpy(OutputFileNameList->UiName, FvInFd->FfsAttuibutes[I= d].UiName, FvInFd->FfsAttuibutes[Id].UiNameSize); } - header =3D (OutputFileNameList->UiNameSize+4) | (EFI_SECTION_= USER_INTERFACE << 24); - Index =3D 0; - while (header) { - SectionHeader[Index] =3D header % 0x100; - header /=3D 0x100; - Index ++; - } - InputFile =3D fopen(InputFileName, "rb+"); - if (InputFile =3D=3D NULL) { - Error("FMMT", 0, 0004, "Could not open input file %s! \n", = ""); - fclose(TmpFile); - free (OutputFileNameList); - free (ChildFileNameList); - return EFI_ABORTED; - } - fseek(InputFile, 0, SEEK_SET); - fseek(InputFile, 0, SEEK_END); - InputFileSize =3D ftell(InputFile); - fseek(InputFile, 0, SEEK_SET); - - Buffer =3D malloc(InputFileSize+OutputFileNameList->UiNameSiz= e+4); - memcpy(Buffer, (CHAR16 *)SectionHeader, 4); - memcpy(Buffer + 4, (CHAR16 *)(OutputFileNameList->UiName), Ou= tputFileNameList->UiNameSize); - if (fread(Buffer+4+OutputFileNameList->UiNameSize, 1, InputFi= leSize, InputFile) !=3D InputFileSize) { - Error("FMMT", 0, 0004, "Could not open sec file %s to add U= I section information! \n", ""); - fclose(TmpFile); - fclose(InputFile); - free(Buffer); - free (OutputFileNameList); - free (ChildFileNameList); - return EFI_ABORTED; - } - fwrite(Buffer, 1, InputFileSize + OutputFileNameList->UiNameS= ize + 4, TmpFile); - free(Buffer); - fclose(TmpFile); - fclose(InputFile); - InputFileName =3D TmpFileName; + if (&FvInFd->FfsAttuibutes[Id].PeiDepexLen > 0){ + OutputFileNameList->PeiDepexLen =3D FvInFd->FfsAttuibutes[= Id].PeiDepexLen; + OutputFileNameList->PeiDepex =3D FvInFd->FfsAttuibutes[= Id].PeiDepex; + } + if (&FvInFd->FfsAttuibutes[Id].DxeDepexLen > 0){ + OutputFileNameList->DxeDepexLen =3D FvInFd->FfsAttuibutes[= Id].DxeDepexLen; + OutputFileNameList->DxeDepex =3D FvInFd->FfsAttuibutes[= Id].DxeDepex; + } + if (&FvInFd->FfsAttuibutes[Id].SmmDepexLen > 0){ + OutputFileNameList->SmmDepexLen =3D FvInFd->FfsAttuibutes[= Id].SmmDepexLen; + OutputFileNameList->SmmDepex =3D FvInFd->FfsAttuibutes[= Id].SmmDepex; + } + } } - if (OutputFileNameList->DepexLen > 0) { - TmpFileName =3D LibFilenameStrExtended(strrchr(GenTempFile (= ), OS_SEP), TemDir, "tmp"); - TmpFile =3D fopen(TmpFileName, "wb+"); - if (TmpFile =3D=3D NULL) { - Error("FMMT", 0, 0004, "Could not open tmp file %s to st= ore Depex section information! \n", ""); - free (OutputFileNameList); - free (ChildFileNameList); - return EFI_ABORTED; + + if (OutputFileNameList->UiNameSize > 0) { + TmpFileName =3D LibFilenameStrExtended(strrchr(GenTempFile (),= OS_SEP), TemDir, "tmp"); + TmpFile =3D fopen(TmpFileName, "wb+"); + if (TmpFile =3D=3D NULL) { + Error("FMMT", 0, 0004, "Could not open tmp file %s to store = UI section information! \n", ""); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + header =3D (OutputFileNameList->UiNameSize+4) | (EFI_SECTION_U= SER_INTERFACE << 24); + Index =3D 0; + while (header) { + SectionHeader[Index] =3D header % 0x100; + header /=3D 0x100; + Index ++; + } + InputFile =3D fopen(InputFileName, "rb+"); + if (InputFile =3D=3D NULL) { + Error("FMMT", 0, 0004, "Could not open input file %s! \n", "= "); + fclose(TmpFile); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + fseek(InputFile, 0, SEEK_SET); + fseek(InputFile, 0, SEEK_END); + InputFileSize =3D ftell(InputFile); + fseek(InputFile, 0, SEEK_SET); + + if (InputFileSize % 4 !=3D 0) { + AlignN =3D 4 - InputFileSize % 4; + } + + Buffer =3D malloc(InputFileSize + AlignN + OutputFileNameList-= >UiNameSize + 4); + memcpy(Buffer + InputFileSize + AlignN , (CHAR16 *)SectionHead= er, 4); + memcpy(Buffer + InputFileSize + AlignN + 4, (CHAR16 *)(OutputF= ileNameList->UiName), OutputFileNameList->UiNameSize); + if (fread(Buffer, 1, InputFileSize, InputFile) !=3D InputFileS= ize) { + Error("FMMT", 0, 0004, "Could not open sec file %s to add UI= section information! \n", ""); + fclose(TmpFile); + fclose(InputFile); + free(Buffer); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + fwrite(Buffer, 1, InputFileSize + AlignN + OutputFileNameList-= >UiNameSize + 4, TmpFile); + free(Buffer); + fclose(TmpFile); + fclose(InputFile); + InputFileName =3D TmpFileName; + } + + if (OutputFileNameList->DxeDepexLen > 0) { + TmpFileName =3D LibFilenameStrExtended(strrchr(GenTempFile (),= OS_SEP), TemDir, "tmp"); + TmpFile =3D fopen(TmpFileName, "wb+"); + if (TmpFile =3D=3D NULL) { + Error("FMMT", 0, 0004, "Could not open tmp file %s to store = Depex section information! \n", ""); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + InputFile =3D fopen(InputFileName, "rb+"); + if (InputFile =3D=3D NULL) { + Error("FMMT", 0, 0004, "Could not open input file %s! \n", "= "); + fclose(TmpFile); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + fseek(InputFile, 0, SEEK_SET); + fseek(InputFile, 0, SEEK_END); + InputFileSize =3D ftell(InputFile); + fseek(InputFile, 0, SEEK_SET); + // + // make sure the section is 4 byte align + // + if (OutputFileNameList->DxeDepexLen % 4 !=3D 0) { + AlignN =3D 4 - OutputFileNameList->DxeDepexLen % 4; + } + Buffer =3D malloc(InputFileSize + OutputFileNameList->DxeDepex= Len + AlignN); + memcpy(Buffer, OutputFileNameList->DxeDepex, OutputFileNameLis= t->DxeDepexLen); + if (AlignN !=3D 0) { + for (Index =3D 0; Index < AlignN; Index ++) { + memcpy(Buffer + OutputFileNameList->DxeDepexLen + Index, A= lignV, 1); } - InputFile =3D fopen(InputFileName, "rb+"); - if (InputFile =3D=3D NULL) { - Error("FMMT", 0, 0004, "Could not open input file %s! \n",= ""); - fclose(TmpFile); + } + if (fread(Buffer + OutputFileNameList->DxeDepexLen + AlignN, 1= , InputFileSize, InputFile) !=3D InputFileSize) { + Error("FMMT", 0, 0004, "Could not open sec file %s to add De= pex section information! \n", ""); + fclose(TmpFile); + fclose(InputFile); + free(Buffer); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + fwrite(Buffer, 1, InputFileSize + OutputFileNameList->DxeDepex= Len + AlignN, TmpFile); + free(Buffer); + fclose(TmpFile); + fclose(InputFile); + InputFileName =3D TmpFileName; + } + + if (OutputFileNameList->PeiDepexLen > 0) { + TmpFileName =3D LibFilenameStrExtended(strrchr(GenTempFile (),= OS_SEP), TemDir, "tmp"); + TmpFile =3D fopen(TmpFileName, "wb+"); + if (TmpFile =3D=3D NULL) { + Error("FMMT", 0, 0004, "Could not open tmp file %s to stor= e Depex section information! \n", ""); free (OutputFileNameList); free (ChildFileNameList); return EFI_ABORTED; + } + InputFile =3D fopen(InputFileName, "rb+"); + if (InputFile =3D=3D NULL) { + Error("FMMT", 0, 0004, "Could not open input file %s! \n", "= "); + fclose(TmpFile); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + fseek(InputFile, 0, SEEK_SET); + fseek(InputFile, 0, SEEK_END); + InputFileSize =3D ftell(InputFile); + fseek(InputFile, 0, SEEK_SET); + // make sure the section is 4 byte align + if (OutputFileNameList->PeiDepexLen % 4 !=3D 0) { + AlignN =3D 4 - OutputFileNameList->PeiDepexLen % 4; + } + Buffer =3D malloc(InputFileSize + OutputFileNameList->PeiDepex= Len + AlignN); + memcpy(Buffer, OutputFileNameList->PeiDepex, OutputFileNameLis= t->PeiDepexLen); + if (AlignN !=3D 0) { + for (Index =3D 0; Index < AlignN; Index ++) { + memcpy(Buffer + OutputFileNameList->PeiDepexLen + Index, A= lignV, 1); } - fseek(InputFile, 0, SEEK_SET); - fseek(InputFile, 0, SEEK_END); - InputFileSize =3D ftell(InputFile); - fseek(InputFile, 0, SEEK_SET); - // make sure the section is 4 byte align - if (OutputFileNameList->DepexLen % 4 !=3D 0) { - AlignN =3D 4 - OutputFileNameList->DepexLen % 4; - } - Buffer =3D malloc(InputFileSize + OutputFileNameList->DepexL= en + AlignN); - memcpy(Buffer, OutputFileNameList->Depex, OutputFileNameList= ->DepexLen); - if (AlignN !=3D 0) { - for (Index =3D 0; Index < AlignN; Index ++) { - memcpy(Buffer + OutputFileNameList->DepexLen + Index= , AlignV, 1); - } - } - if (fread(Buffer + OutputFileNameList->DepexLen + AlignN, 1,= InputFileSize, InputFile) !=3D InputFileSize) { - Error("FMMT", 0, 0004, "Could not open sec file %s to ad= d Depex section information! \n", ""); - fclose(TmpFile); - fclose(InputFile); - free(Buffer); - free (OutputFileNameList); - free (ChildFileNameList); - return EFI_ABORTED; - } - fwrite(Buffer, 1, InputFileSize + OutputFileNameList->DepexL= en + AlignN, TmpFile); + } + if (fread(Buffer + OutputFileNameList->PeiDepexLen + AlignN, 1= , InputFileSize, InputFile) !=3D InputFileSize) { + Error("FMMT", 0, 0004, "Could not open sec file %s to add De= pex section information! \n", ""); + fclose(TmpFile); + fclose(InputFile); free(Buffer); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + fwrite(Buffer, 1, InputFileSize + OutputFileNameList->PeiDepex= Len + AlignN, TmpFile); + free(Buffer); + fclose(TmpFile); + fclose(InputFile); + InputFileName =3D TmpFileName; + } + + if (OutputFileNameList->SmmDepexLen > 0) { + TmpFileName =3D LibFilenameStrExtended(strrchr(GenTempFile (),= OS_SEP), TemDir, "tmp"); + TmpFile =3D fopen(TmpFileName, "wb+"); + if (TmpFile =3D=3D NULL) { + Error("FMMT", 0, 0004, "Could not open tmp file %s to store = Depex section information! \n", ""); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + InputFile =3D fopen(InputFileName, "rb+"); + if (InputFile =3D=3D NULL) { + Error("FMMT", 0, 0004, "Could not open input file %s! \n", "= "); + fclose(TmpFile); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + fseek(InputFile, 0, SEEK_SET); + fseek(InputFile, 0, SEEK_END); + InputFileSize =3D ftell(InputFile); + fseek(InputFile, 0, SEEK_SET); + // make sure the section is 4 byte align + if (OutputFileNameList->SmmDepexLen % 4 !=3D 0) { + AlignN =3D 4 - OutputFileNameList->SmmDepexLen % 4; + } + Buffer =3D malloc(InputFileSize + OutputFileNameList->SmmDepex= Len + AlignN); + memcpy(Buffer, OutputFileNameList->SmmDepex, OutputFileNameLis= t->SmmDepexLen); + if (AlignN !=3D 0) { + for (Index =3D 0; Index < AlignN; Index ++) { + memcpy(Buffer + OutputFileNameList->SmmDepexLen + Index, A= lignV, 1); + } + } + if (fread(Buffer + OutputFileNameList->SmmDepexLen + AlignN, 1= , InputFileSize, InputFile) !=3D InputFileSize) { + Error("FMMT", 0, 0004, "Could not open sec file %s to add De= pex section information! \n", ""); fclose(TmpFile); fclose(InputFile); - InputFileName =3D TmpFileName; - } + free(Buffer); + free (OutputFileNameList); + free (ChildFileNameList); + return EFI_ABORTED; + } + fwrite(Buffer, 1, InputFileSize + OutputFileNameList->SmmDepex= Len + AlignN, TmpFile); + free(Buffer); + fclose(TmpFile); + fclose(InputFile); + InputFileName =3D TmpFileName; + } + for (Id =3D FvInFd->FfsNumbers; Id <=3D FvInFd->FfsNumbers; Id--)= { if ((memcmp(&FvInFd->FfsAttuibutes[Id].GuidName, &(LocalEncap= Data->FvExtHeader->FvName), sizeof(EFI_GUID)) =3D=3D 0)){ if (access(FvInFd->FfsAttuibutes[Id].FfsName, 0) !=3D -1)= { @@ -5083,8 +5264,12 @@ LibEncapNewFvFile( memcpy(OutputFileNameList->UiName, FvInFd->FfsAttuibutes[I= d].UiName, FvInFd->FfsAttuibutes[Id].UiNameSize); OutputFileNameList->UiNameSize =3D FvInFd->FfsAttuibutes[I= d].UiNameSize; OutputFileNameList->FFSName =3D FvInFd->FfsAttuibutes[Id].= FfsName; - OutputFileNameList->Depex =3D FvInFd->FfsAttuibutes[Id].De= pex; - OutputFileNameList->DepexLen =3D FvInFd->FfsAttuibutes[Id]= .DepexLen; + OutputFileNameList->PeiDepex =3D FvInFd->FfsAttuibutes[Id]= .PeiDepex; + OutputFileNameList->PeiDepexLen =3D FvInFd->FfsAttuibutes[= Id].PeiDepexLen; + OutputFileNameList->DxeDepex =3D FvInFd->FfsAttuibutes[Id]= .DxeDepex; + OutputFileNameList->DxeDepexLen =3D FvInFd->FfsAttuibutes[= Id].DxeDepexLen; + OutputFileNameList->SmmDepex =3D FvInFd->FfsAttuibutes[Id]= .SmmDepex; + OutputFileNameList->SmmDepexLen =3D FvInFd->FfsAttuibutes[= Id].SmmDepexLen; OutputFileNameList->FfsFoundFlag =3D TRUE; OutputFileNameList->IsFFS =3D TRUE; OutputFileNameList->InFvId =3D Id; --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73263): https://edk2.groups.io/g/devel/message/73263 Mute This Topic: https://groups.io/mt/81597309/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-