From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.124545.1671074809916083269 for ; Wed, 14 Dec 2022 19:26:50 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=Q4ChvTzj; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: min.m.xu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671074809; x=1702610809; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=8rxQzni8hmulDaqQGHLfj9iFtMAgOt8Sm+YiKP4iOOg=; b=Q4ChvTzjQZ3vsGwCg0GgvH7bM+UXQtv35tqbWo+pQuBpjC5x62KNS6g8 KQx2XXNJLHX5k15CTkv7vp8vitpL5BNeXca6vCvp3uo4xMc4IppP3y+B2 BslmF113/MucGVo53JwIOA15v9BjVdXLDAaXeR33nr6yBO6ORjxlTONGV 4pQkIHn7GF8ZpCi5pluOy7WA7M9KQprFE6jZlkZZuCBNb/87YqlV/k4ro m/L91OhsL4sgFqDTm2meloy4sOUQ7/mxyumWKPu+ybT1Wu0d7fBQCWWeE MbDQLU74WeTs1bN8D4fDmZYhVgx18DdU1MIFEjHctzLZ1pFvdi5fReoxM Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10561"; a="317289410" X-IronPort-AV: E=Sophos;i="5.96,246,1665471600"; d="scan'208";a="317289410" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2022 19:26:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10561"; a="717841239" X-IronPort-AV: E=Sophos;i="5.96,246,1665471600"; d="scan'208";a="717841239" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga004.fm.intel.com with ESMTP; 14 Dec 2022 19:26:49 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Wed, 14 Dec 2022 19:26:48 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Wed, 14 Dec 2022 19:26:48 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.174) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Wed, 14 Dec 2022 19:26:48 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G7IQAf7v26/WtxPGRUw6vMLy+4T7Kt7UgVEUNawgQ2HNW0VuNw6NIxK13bzvbrx6pAeaIufTWw0SIeZPXBvlQ88HxPORKfk52eHw3RWGIpPvVY+PZ3kfGNsz1l/Q0ves++mjXGQg+hJ+GP1vjsQo2LZoQdCC4SW7e0VBGoxnZcOfoK5yQcl/YQhUj39qmWsiodGrnWiUEdgYq7MvURPVZX5hqYb3GETAlJc+DLqdSpHcD6ifJttn+rIaDdseR5/Am6+VNjPxxZFeJYiHsoPy5WIXoXsTt9ibhBVOEKIXB8cWxoohGjkH8KfpTM19ACbxCzuGUGxPvpoMzN+MrQijDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TBXxyzWLy2x2bJeD507ShNcZ+nPWaCCBCh6XN+6F00k=; b=EUowzZ0dHZQsAhfd10mTMeOfev9LKrf+hy4KI99hfyOBe2C/9pdwZLONaMt8gA9PUveK2r1O90SBf1MBcpdqSIrsqImKZ1azp/bSY71SLrFTyzRaMtZCvQFHLXQ7Cht9DtYboSQpJ1kZXxAHYUZXxUU3HHr0CxGYODKHMXywGV7KWWwV30kZrgH997hLrTibSyBYpi1rKXZ9Z8zquljy5FROkVrKhpyENUHuiD63URPRH4QhmatfAEjQixK1ZPKKBc1idvMDaAoMcnsW+8QB3UQRXTM12+SIkrQbWa1CIFfa12wnugrKQufWje/t+A9iWAw6N4/qJLQ23ijhEm6h/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from SJ0PR11MB5069.namprd11.prod.outlook.com (2603:10b6:a03:2ad::6) by MN2PR11MB4742.namprd11.prod.outlook.com (2603:10b6:208:26b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Thu, 15 Dec 2022 03:26:45 +0000 Received: from SJ0PR11MB5069.namprd11.prod.outlook.com ([fe80::10be:d81f:bb30:52d0]) by SJ0PR11MB5069.namprd11.prod.outlook.com ([fe80::10be:d81f:bb30:52d0%5]) with mapi id 15.20.5880.014; Thu, 15 Dec 2022 03:26:45 +0000 From: "Min Xu" To: "devel@edk2.groups.io" , Leif Lindholm , Ard Biesheuvel , Abner Chang , Daniel Schaefer CC: Gerd Hoffmann , "Aktas, Erdem" , James Bottomley , "Yao, Jiewen" , Tom Lendacky , "Xu, Min M" Subject: Re: [PATCH V2 1/4] EmbeddedPkg/PrePiLib: Add FFS_CHECK_SECTION_HOOK when finding section Thread-Topic: [PATCH V2 1/4] EmbeddedPkg/PrePiLib: Add FFS_CHECK_SECTION_HOOK when finding section Thread-Index: AQHZDruQeRzhq0CuPEytYwAT3/Inhq5uS9rQ Date: Thu, 15 Dec 2022 03:26:45 +0000 Message-ID: References: <20221213062409.932-1-min.m.xu@intel.com> <20221213062409.932-2-min.m.xu@intel.com> In-Reply-To: <20221213062409.932-2-min.m.xu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SJ0PR11MB5069:EE_|MN2PR11MB4742:EE_ x-ms-office365-filtering-correlation-id: c8ca629b-1f02-4d41-8657-08dade4c3155 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: dXkIx7bGN8QxKLeMb52+J4YdVRpsGXOMTxeDyyoC2iJCbQrckAs8m0uaZhgSqFRqMls6A5xhgeRiqhcrPo/MyZ9Onwv/BwnQLeZgXNmCMOO8ameEYOrmeiH71Drh7jpUZtox8R164nS+Pn/zQPo6OCYgmohpqQw/uPEs0tXVr3Q0kuo7E6JdIg5EExm8qqxvhcBBRCvpxbXQmkv32B2pFisgz855hln+8oc4hK2CYdr7YY/ERTMKltOn6Rry8ckpCY0rwqlX0cHu/KViG8nehzwL8s67n/cLWJQyI9QmEocI11Kpvtv7a9t+a5rq1e/R/iYI2C6TJEj2T4wMXI3FXr+7P4dtoLDYferq7pa5wPtopUQuENy+j44us1GZd5Bb+Wun2xO3nX/aj2Poud9D75GjhUTD8JXbg3DByoy0VzkA/qYQceX0Rj86rk6uQ6muf26pD9FfRDYBqrBMXChQRB8mn6wUxNdS/0eIzTV8tDskv6nhb+7oSCd7ZM5zRrC0AZ63OOMoVXHr8gQtGNyMb8JQRjOALh4o+Gw99kZ8dyr7R//iQohABHJ5necav/j2mbp6DirmyFnDwJdEI8taBBfzxHPVnUx1B38ZZa9GI237OMeEyQ+1oZc1T4FhVmY6Jwh+2v0LMfSiBeaaApfgXatdLSXfrZpW5fm7FzZ7HD5flOqqRJmYnxSlkrjpTgFh7QT+jCMwat5ymaIThRUAu37hmWJ5f3i6gr9ScGO+T2k= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5069.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(6029001)(366004)(396003)(376002)(136003)(346002)(39860400002)(451199015)(86362001)(83380400001)(33656002)(55016003)(6506007)(110136005)(966005)(9686003)(316002)(107886003)(186003)(53546011)(26005)(478600001)(2906002)(71200400001)(41300700001)(8936002)(52536014)(5660300002)(4326008)(64756008)(66476007)(122000001)(82960400001)(8676002)(66556008)(38070700005)(66946007)(38100700002)(66446008)(76116006)(66899015)(54906003)(7696005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?4LCs+qEjtrIhh+ROdDTq0oQpAwLdsRAhKCmlaOGhkjRXM5O431H7wiFMTYE+?= =?us-ascii?Q?sCXlei+WvSFKSj1a8Qfr1S4urACEV637iy+JFaxJa4a3UVbGWMiBGJt09al/?= =?us-ascii?Q?RmDfVt5pYGvano5PULDD3OQhlsGCtF/pSwz7on8oZhgyEYB9edKYpFFJ7vid?= =?us-ascii?Q?oqC7cRqexG/c2/3pQwuU8CIWWdonBsyODAaZpYnQ0aHeyLQKl5LD/EiFwRbp?= =?us-ascii?Q?4A1pv43oucKfPeiEwBZX1mY5OAcvB2XgcHFIbu+mMo6gVL+pL/bVn3kFOeT0?= =?us-ascii?Q?iHHckfRqeHhsECdaLgiwiBZei6j99oWk92tA6Ca/lFt8VzMEGxbD3vBqomCP?= =?us-ascii?Q?b207b6O0Poq/JaM3MX9qpiVxbtJlqi7TLxiMgy4s0Mhz/LmWA0HsPK2zp3KT?= =?us-ascii?Q?MXGV7QYSyRjYnTJDmhO/UT77VNvfZxrANwowqzNHxfyOJF3ZAO9JE7Xb4R+N?= =?us-ascii?Q?O/AV25fu5Rsm+cHqbpLSaj5RRRfGcEdDlN52UOoBER5rBwFOYI4IyuV5g7fT?= =?us-ascii?Q?/dQLGqeeTt6yE2Q0tf4rTJAc78nRyj16/wpXlQojvAqijKuoe/VikEjW5cvw?= =?us-ascii?Q?lBjdOvC3S0+CgvS4E+d95KxX+HoOYnoer3I8GwH7fyxsERd+hJrnXHqMFoAS?= =?us-ascii?Q?QnKX09zl5ecETcus3KL11oMBuxA1V9hgOeVgOnLO7b4pttxH/g8tDmmGwdSw?= =?us-ascii?Q?Hy3TRzWnKhD6qIJIx03+ukA+zFVC9fPKutmxuogF1t1s20u6aLM31d39XN0X?= =?us-ascii?Q?SfK5PhCJKpofXPMfdPDhBT+m32KLa/vjUecLYh/+2JowXGLd27a9bVpj9Wph?= =?us-ascii?Q?ezMDZf/tJx9i0AxRMbXkIKPNppVNX+vFv6eBIx97c0Hgj2/vDNWhq80hODqv?= =?us-ascii?Q?MX6+YTajbu96v3VKbXiLqleX2KsmVxTCSRGZicmUiZh5pGVBY0CmLJlon242?= =?us-ascii?Q?MnMa/bYD9SftERv1irwlWmwM0OjKzzHvWbtxts29RQIND1m2Hm1ik0BmqpHW?= =?us-ascii?Q?8FN+WT0ap8fEYh9M4n//irlg0RnulpDIpkrxCDgDWKyICDqCWP+ZhNCZuIdc?= =?us-ascii?Q?XpAwuUFVt/PQrS222z7DzKPb9muLE99B8XEFFj6VUSnSU/wkufUFjscbIyu4?= =?us-ascii?Q?E98Y2xaVg1svjG909KU3Ow1RYes6pIhoPeZQUEbWn3tV5ZsHcS5BGNvY/7nr?= =?us-ascii?Q?YVVGMNadOgY0FpDf6j+Hu1Kh65vflb2ih+4anEWGXyssV4feOhOc8ZVHOf8O?= =?us-ascii?Q?k8UY5eAcdZex7eaXnHw6lI62Y+VG0JR0/xGzyvNKnBYXp4hSRhP/3mUMffuM?= =?us-ascii?Q?ppF9AJi+cHr56QmbdEhKCBEpawSN2CT54dhOBlmhzpIyXFTQbhCSTHnIGeuZ?= =?us-ascii?Q?RPaR28xJ2jY5VJ8+YGY7F6dPYAFI2eq6YkBmX7GAvs+Q3aaej3HxhXNamzqw?= =?us-ascii?Q?U+j3vdcA2DHIAOetIm6H4+Rp6cUIra5jNsFohlR7R7LQ1qC+CLNGS8sK0XOi?= =?us-ascii?Q?WktGbNXM6TIdRq5V0mj+8g3cv/9JMzfF3+zxR9G6DHWqtvJA7tGU41K6Sl5m?= =?us-ascii?Q?C9u6vhzzUEPdq9/AnDWCJiliHE8loB2FakzmmwTy?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5069.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8ca629b-1f02-4d41-8657-08dade4c3155 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2022 03:26:45.2759 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: LS3om2mweOVgJvJtURg6LSyBT5TM1CbY42Nr9Ie/WVHXewT6CEcf02ayxoztvFlef8WYuwJAL+Dw1Xv/7V7mNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4742 Return-Path: min.m.xu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Leif/Ard/Abner/Daniel Since you're the maintainer/reviewer of EmbeddedPkg, would you please help = to review this patch? Any comments is welcome. Thanks Min > -----Original Message----- > From: Xu, Min M > Sent: Tuesday, December 13, 2022 2:24 PM > To: devel@edk2.groups.io > Cc: Xu, Min M ; Leif Lindholm > ; Ard Biesheuvel ; > Abner Chang ; Daniel Schaefer > ; Gerd Hoffmann ; Aktas, > Erdem ; James Bottomley ; > Yao, Jiewen ; Tom Lendacky > > Subject: [PATCH V2 1/4] EmbeddedPkg/PrePiLib: Add > FFS_CHECK_SECTION_HOOK when finding section >=20 > From: Min M Xu >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4152 >=20 > EmbeddedPkg/PrePiLib provides the service of finding sections based on th= e > input SectionType. But sometimes there maybe multiple sections with the > same SectionType. FFS_CHECK_SECTION_HOOK is a hook which can be called > to do additional check. >=20 > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Abner Chang > Cc: Daniel Schaefer > Cc: Gerd Hoffmann > Cc: Erdem Aktas > Cc: James Bottomley > Cc: Jiewen Yao > Cc: Tom Lendacky > Signed-off-by: Min Xu >=20 > EmbeddedPkg > --- > EmbeddedPkg/Include/Library/PrePiLib.h | 23 +++++++++++--- > EmbeddedPkg/Library/PrePiLib/FwVol.c | 42 ++++++++++++++++++------- > EmbeddedPkg/Library/PrePiLib/PrePiLib.c | 2 +- > 3 files changed, 49 insertions(+), 18 deletions(-) >=20 > diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h > b/EmbeddedPkg/Include/Library/PrePiLib.h > index 3741b08c4478..f60b6678185a 100644 > --- a/EmbeddedPkg/Include/Library/PrePiLib.h > +++ b/EmbeddedPkg/Include/Library/PrePiLib.h > @@ -52,11 +52,23 @@ FfsFindNextFile ( > IN OUT EFI_PEI_FILE_HANDLE *FileHandle > ); >=20 > +/** > + * This is a hook which is used to check if the section is the target on= e. > + * > + */ > +typedef > +EFI_STATUS > +(EFIAPI *FFS_CHECK_SECTION_HOOK)( > + IN EFI_COMMON_SECTION_HEADER *Section > + ); > + > /** > This service enables discovery sections of a given type within a valid= FFS file. > + Caller also can provide a SectionCheckHook to do additional checking. >=20 > - @param SearchType The value of the section type to find. > - @param FfsFileHeader A pointer to the file header that contai= ns the > set of sections to > + @param SectionType The value of the section type to find. > + @param SectionCheckHook A hook which can check if the section is= the > target one. > + @param FileHeader A pointer to the file header that contai= ns the set > of sections to > be searched. > @param SectionData A pointer to the discovered section, if = successful. >=20 > @@ -67,9 +79,10 @@ FfsFindNextFile ( > EFI_STATUS > EFIAPI > FfsFindSectionData ( > - IN EFI_SECTION_TYPE SectionType, > - IN EFI_PEI_FILE_HANDLE FileHandle, > - OUT VOID **SectionData > + IN EFI_SECTION_TYPE SectionType, > + IN FFS_CHECK_SECTION_HOOK SectionCheckHook, > + IN EFI_PEI_FILE_HANDLE FileHandle, > + OUT VOID **SectionData > ); >=20 > /** > diff --git a/EmbeddedPkg/Library/PrePiLib/FwVol.c > b/EmbeddedPkg/Library/PrePiLib/FwVol.c > index 0a6d6925b7ea..778d8b13c33b 100644 > --- a/EmbeddedPkg/Library/PrePiLib/FwVol.c > +++ b/EmbeddedPkg/Library/PrePiLib/FwVol.c > @@ -264,16 +264,18 @@ FindFileEx ( > Go through the file to search SectionType section, > when meeting an encapsuled section. >=20 > - @param SectionType - Filter to find only section of this type. > - @param Section - From where to search. > - @param SectionSize - The file size to search. > - @param OutputBuffer - Pointer to the section to search. > + @param SectionType - Filter to find only section of this type. > + @param SectionCheckHook - A hook which can check if the section is t= he > target one. > + @param Section - From where to search. > + @param SectionSize - The file size to search. > + @param OutputBuffer - Pointer to the section to search. >=20 > @retval EFI_SUCCESS > **/ > EFI_STATUS > FfsProcessSection ( > IN EFI_SECTION_TYPE SectionType, > + IN FFS_CHECK_SECTION_HOOK SectionCheckHook, > IN EFI_COMMON_SECTION_HEADER *Section, > IN UINTN SectionSize, > OUT VOID **OutputBuffer > @@ -292,7 +294,9 @@ FfsProcessSection ( > UINT32 AuthenticationStatus; > CHAR8 *CompressedData; > UINT32 CompressedDataLength; > + BOOLEAN Found; >=20 > + Found =3D FALSE; > *OutputBuffer =3D NULL; > ParsedLength =3D 0; > Status =3D EFI_NOT_FOUND; > @@ -302,13 +306,23 @@ FfsProcessSection ( > } >=20 > if (Section->Type =3D=3D SectionType) { > - if (IS_SECTION2 (Section)) { > - *OutputBuffer =3D (VOID *)((UINT8 *)Section + sizeof > (EFI_COMMON_SECTION_HEADER2)); > + if (SectionCheckHook !=3D NULL) { > + Found =3D SectionCheckHook (Section) =3D=3D EFI_SUCCESS; > } else { > - *OutputBuffer =3D (VOID *)((UINT8 *)Section + sizeof > (EFI_COMMON_SECTION_HEADER)); > + Found =3D TRUE; > } >=20 > - return EFI_SUCCESS; > + if (Found) { > + if (IS_SECTION2 (Section)) { > + *OutputBuffer =3D (VOID *)((UINT8 *)Section + sizeof > (EFI_COMMON_SECTION_HEADER2)); > + } else { > + *OutputBuffer =3D (VOID *)((UINT8 *)Section + sizeof > (EFI_COMMON_SECTION_HEADER)); > + } > + > + return EFI_SUCCESS; > + } else { > + goto CheckNextSection; > + } > } else if ((Section->Type =3D=3D EFI_SECTION_COMPRESSION) || (Sectio= n- > >Type =3D=3D EFI_SECTION_GUID_DEFINED)) { > if (Section->Type =3D=3D EFI_SECTION_COMPRESSION) { > if (IS_SECTION2 (Section)) { > @@ -415,6 +429,7 @@ FfsProcessSection ( > } else { > return FfsProcessSection ( > SectionType, > + SectionCheckHook, > DstBuffer, > DstBufferSize, > OutputBuffer > @@ -422,6 +437,7 @@ FfsProcessSection ( > } > } >=20 > +CheckNextSection: > if (IS_SECTION2 (Section)) { > SectionLength =3D SECTION2_SIZE (Section); > } else { > @@ -456,9 +472,10 @@ FfsProcessSection ( EFI_STATUS EFIAPI > FfsFindSectionData ( > - IN EFI_SECTION_TYPE SectionType, > - IN EFI_PEI_FILE_HANDLE FileHandle, > - OUT VOID **SectionData > + IN EFI_SECTION_TYPE SectionType, > + IN FFS_CHECK_SECTION_HOOK SectionCheckHook, > + IN EFI_PEI_FILE_HANDLE FileHandle, > + OUT VOID **SectionData > ) > { > EFI_FFS_FILE_HEADER *FfsFileHeader; > @@ -478,6 +495,7 @@ FfsFindSectionData ( >=20 > return FfsProcessSection ( > SectionType, > + SectionCheckHook, > Section, > FileSize, > SectionData > @@ -799,7 +817,7 @@ FfsProcessFvFile ( > // > // Find FvImage in FvFile > // > - Status =3D FfsFindSectionData (EFI_SECTION_FIRMWARE_VOLUME_IMAGE, > FvFileHandle, (VOID **)&FvImageHandle); > + Status =3D FfsFindSectionData (EFI_SECTION_FIRMWARE_VOLUME_IMAGE, > NULL, > + FvFileHandle, (VOID **)&FvImageHandle); > if (EFI_ERROR (Status)) { > return Status; > } > diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c > b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c > index a0c5d02debd0..3b6fc4f0eba8 100644 > --- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c > +++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c > @@ -131,7 +131,7 @@ LoadDxeCoreFromFfsFile ( > VOID *Hob; > EFI_FV_FILE_INFO FvFileInfo; >=20 > - Status =3D FfsFindSectionData (EFI_SECTION_PE32, FileHandle, > &PeCoffImage); > + Status =3D FfsFindSectionData (EFI_SECTION_PE32, NULL, FileHandle, > + &PeCoffImage); > if (EFI_ERROR (Status)) { > return Status; > } > -- > 2.29.2.windows.2