From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: jiewen.yao@intel.com) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by groups.io with SMTP; Mon, 06 May 2019 23:03:01 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 May 2019 23:03:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,440,1549958400"; d="scan'208";a="142133950" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga006.jf.intel.com with ESMTP; 06 May 2019 23:03:00 -0700 Received: from fmsmsx153.amr.corp.intel.com (10.18.125.6) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 6 May 2019 23:03:00 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by FMSMSX153.amr.corp.intel.com (10.18.125.6) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 6 May 2019 23:03:00 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.249]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.136]) with mapi id 14.03.0415.000; Tue, 7 May 2019 14:02:58 +0800 From: "Yao, Jiewen" To: "Bi, Dandan" , "Zhang, Chao B" , "devel@edk2.groups.io" Subject: Re: [edk2-devel] [patch 08/11] SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage Thread-Topic: [edk2-devel] [patch 08/11] SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage Thread-Index: AQHU/jGnNT8Mi8nickCWCiicUhfaTqZfKzKggAANBSA= Date: Tue, 7 May 2019 06:02:58 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503F62E0C3@shsmsx102.ccr.corp.intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> <1599D055711F0B7C.4588@groups.io> <3C0D5C461C9E904E8F62152F6274C0BB40BD01BF@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <3C0D5C461C9E904E8F62152F6274C0BB40BD01BF@SHSMSX104.ccr.corp.intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMGIxZjQ5YTEtODdkMC00MzQ0LWEyMzUtNWMyZmI3YWUyZWY0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiMlpsempqU0RCQWxBTnc1WEtNNUMwT1U3TEVWeFlDQTVlSVNIK0FwamRvMVlxRVdCTEVPenFJMlFpckNcL1QrVjkifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: jiewen.yao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jiewen.yao@intel.com > > -----Original Message----- > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > > Dandan Bi > > Sent: Monday, April 29, 2019 10:16 AM > > To: devel@edk2.groups.io > > Cc: Yao, Jiewen ; Chao > > Subject: [edk2-devel] [patch 08/11] SignedCapsulePkg: Remove > > PcdFrameworkCompatibilitySupport usage > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 > > > > Currently Framework compatibility support is not needed and > > PcdFrameworkCompatibilitySupport will be removed from edk2. > > So remove the usage of this PCD firstly. > > > > Cc: Jiewen Yao > > Cc: Chao Zhang > Signed-off-by: Dandan Bi > > --- > > .../Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 6 > +++--- > > .../RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf | 5 > +---- > > 2 files changed, 4 insertions(+), 7 deletions(-) > > > > diff --git > > > a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleL > > oadPei.c > > > b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleL > > oadPei.c > > index 29a2cc520c..eda3cc5420 100644 > > --- > > > a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleL > > oadPei.c > > +++ > > > b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleL > > oa > > +++ dPei.c > > @@ -7,11 +7,11 @@ > > buffer overflow, integer overflow. > > > > ProcessRecoveryCapsule(), ProcessFmpCapsuleImage(), > > ProcessRecoveryImage(), > > ValidateFmpCapsule() will receive untrusted input and do basic > validation. > > > > -Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved. > > +Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved. > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > **/ > > > > // > > @@ -764,11 +764,11 @@ LoadRecoveryCapsule ( > > for (CapsuleInstance =3D 1; CapsuleInstance <=3D > NumberRecoveryCapsules; > > CapsuleInstance++) { > > CapsuleSize =3D 0; > > Status =3D DeviceRecoveryPpi->GetRecoveryCapsuleInfo ( > > (EFI_PEI_SERVICES > **)PeiServices, > > DeviceRecoveryPpi, > > - > FeaturePcdGet(PcdFrameworkCompatibilitySupport) ? > > CapsuleInstance - 1 : CapsuleInstance, > > + CapsuleInstance, > > &CapsuleSize, > > &CapsuleType > > ); > > DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - > > GetRecoveryCapsuleInfo (%d - %x) - %r\n", CapsuleInstance, CapsuleSize= , > > Status)); > > if (EFI_ERROR (Status)) { > > @@ -781,11 +781,11 @@ LoadRecoveryCapsule ( > > continue; > > } > > Status =3D DeviceRecoveryPpi->LoadRecoveryCapsule ( > > (EFI_PEI_SERVICES > **)PeiServices, > > DeviceRecoveryPpi, > > - > FeaturePcdGet(PcdFrameworkCompatibilitySupport) ? > > CapsuleInstance - 1 : CapsuleInstance, > > + CapsuleInstance, > > CapsuleBuffer > > ); > > DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - > LoadRecoveryCapsule > > (%d) - %r\n", CapsuleInstance, Status)); > > if (EFI_ERROR (Status)) { > > FreePages (CapsuleBuffer, EFI_SIZE_TO_PAGES(CapsuleSize)); > diff --git > > > a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleL > > oadPei.inf > > > b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleL > > oadPei.inf > > index f0f5d21a7a..431b0e1802 100644 > > --- > > > a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleL > > oadPei.inf > > +++ > > > b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleL > > oa > > +++ dPei.inf > > @@ -1,11 +1,11 @@ > > ## @file > > # Recovery module. > > # > > # Load Recovery capsule and install FV. > > # > > -# Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<= BR> > > +# Copyright (c) 2016 - 2019, Intel Corporation. All rights > > +reserved.
> > # > > # SPDX-License-Identifier: BSD-2-Clause-Patent # # ## @@ > -54,13 +54,10 > > @@ > > > > [Pcd] > > > > > gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGu > > id ## CONSUMES > > > gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid > > ## CONSUMES > > > > -[FeaturePcd] > > - > gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport > > ## CONSUMES > > - > > [depex] > > gEfiPeiBootInRecoveryModePpiGuid > > > > [UserExtensions.TianoCore."ExtraFiles"] > > RecoveryModuleLoadPeiExtra.uni > > -- > > 2.18.0.windows.1 > > > > > >=20