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|0x30001054 - ## 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|0x30001055 - [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|BOOLEAN|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|0x00010025 + [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 (#88644): https://edk2.groups.io/g/devel/message/88644 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] -=-=-=-=-=-=-=-=-=-=-=-
