Reviewed-by: Jian J Wang <jian.j.w...@intel.com> Regards, Jian
> -----Original Message----- > From: Chen, Gang C <gang.c.c...@intel.com> > Sent: Friday, April 08, 2022 11:52 AM > To: devel@edk2.groups.io > Cc: Jiang, Guomin <guomin.ji...@intel.com>; Bi, Dandan > <dandan...@intel.com>; Zhang, Di <di.zh...@intel.com>; Wang, Jian J > <jian.j.w...@intel.com>; Gao, Liming <gaolim...@byosoft.com.cn>; Dong, Eric > <eric.d...@intel.com>; Ni, Ray <ray...@intel.com> > Subject: [PATCH] MdeModulePkg/dec: update the PcdCpuStackGuard property > > Update the PcdCpuStackGuard from PcdsFixedAtBuild to PcdsDynamicEx. > > Meanwhile, remove the duplicate check for PcdCpuStackGuard for > some limitation, which has been checked at the entry of > InitializeMpExceptionStackSwitchHandlers. > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3897 > > Cc: Jian J Wang <jian.j.w...@intel.com> > Cc: Liming Gao <gaolim...@byosoft.com.cn> > Cc: devel@edk2.groups.io > Cc: Eric Dong <eric.d...@intel.com> > Cc: Ray Ni <ray...@intel.com> > > Signed-off-by: Gang Chen <gang.c.c...@intel.com> > --- > MdeModulePkg/MdeModulePkg.dec | 14 +++++++------- > .../CpuExceptionHandlerLib/PeiCpuException.c | 2 +- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/MdeModulePkg/MdeModulePkg.dec > b/MdeModulePkg/MdeModulePkg.dec > index 463e889e9a..72e7e2eced 100644 > --- a/MdeModulePkg/MdeModulePkg.dec > +++ b/MdeModulePkg/MdeModulePkg.dec > @@ -1070,13 +1070,6 @@ > # @Prompt The Heap Guard feature mask > > gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask|0x0|UINT8|0 > x30001054 > > - ## Indicates if UEFI Stack Guard will be enabled. > - # If enabled, stack overflow in UEFI can be caught, preventing chaotic > consequences.<BR><BR> > - # TRUE - UEFI Stack Guard will be enabled.<BR> > - # FALSE - UEFI Stack Guard will be disabled.<BR> > - # @Prompt Enable UEFI Stack Guard. > - > gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard|FALSE|BOOLEAN|0x30 > 001055 > - > [PcdsFixedAtBuild, PcdsPatchableInModule] > ## Dynamic type PCD can be registered callback function for Pcd setting > action. > # PcdMaxPeiPcdCallBackNumberPerPcdEntry indicates the maximum number > of callback function > @@ -2079,6 +2072,13 @@ > # @Prompt Enable PCIe Resizable BAR Capability support. > > gEfiMdeModulePkgTokenSpaceGuid.PcdPcieResizableBarSupport|FALSE|BOOLE > AN|0x10000024 > > + ## Indicates if UEFI Stack Guard will be enabled. > + # If enabled, stack overflow in UEFI can be caught, preventing chaotic > consequences.<BR><BR> > + # TRUE - UEFI Stack Guard will be enabled.<BR> > + # FALSE - UEFI Stack Guard will be disabled.<BR> > + # @Prompt Enable UEFI Stack Guard. > + > gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard|FALSE|BOOLEAN|0x00 > 010025 > + > [PcdsPatchableInModule] > ## Specify memory size with page number for PEI code when > # Loading Module at Fixed Address feature is enabled. > diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c > b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c > index 687fc4177f..bcd4175ffa 100644 > --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c > +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuException.c > @@ -254,7 +254,7 @@ InitializeCpuExceptionHandlersEx ( > // > // Initializing stack switch is only necessary for Stack Guard > functionality. > // > - if (PcdGetBool (PcdCpuStackGuard) && (InitData != NULL)) { > + if (InitData != NULL) { > Status = ArchSetupExceptionStack (InitData); > } > } > -- > 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#88689): https://edk2.groups.io/g/devel/message/88689 Mute This Topic: https://groups.io/mt/90341216/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
