[edk2-devel] [patch 08/11] SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage

[Yao, Jiewen]

Reviewed-by: Jiewen.yao at intel.com


> > -----Original Message-----
> > From: devel at edk2.groups.io [mailto:devel at edk2.groups.io] On Behalf Of
> > Dandan Bi
> > Sent: Monday, April 29, 2019 10:16 AM
> > To: devel at edk2.groups.io
> > Cc: Yao, Jiewen <jiewen.yao at intel.com>; Chao
> > Subject: [edk2-devel] [patch 08/11] SignedCapsulePkg: Remove
> > PcdFrameworkCompatibilitySupport usage
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464
> >
> > 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 <jiewen.yao at intel.com>
> > Cc: Chao Zhang <chao.b.zhang at intel.com
> > Signed-off-by: Dandan Bi <dandan.bi at intel.com>
> > ---
> >  .../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.<BR>
> > +Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>
> >  SPDX-License-Identifier: BSD-2-Clause-Patent
> >
> >  **/
> >
> >  //
> > @@ -764,11 +764,11 @@ LoadRecoveryCapsule (
> >      for (CapsuleInstance = 1; CapsuleInstance <=
> NumberRecoveryCapsules;
> > CapsuleInstance++) {
> >        CapsuleSize = 0;
> >        Status = 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 = 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.<BR>
> >  #
> >  #  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
> >
> >
> > 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40077): https://edk2.groups.io/g/devel/message/40077
Mute This Topic: https://groups.io/mt/31529278/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-