MdePkg: Move StackCheckLibStaticInit to StackCheckLib

This commit oves StackCheckLib from a NULL lib to an instance of StackCheckLib. This requires every entry point to add a library dependency on StackCheckLib. It also requires every SEC module to have a dependency on StackCheckLib because there is no standard SEC entry point. It allows for greater flexibility for a platform to apply stack cookies and simplifies DSC logic. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Oliver Smith-Denny <osde@microsoft.com>
2025-04-08 17:05:09 +02:00 · 2025-01-29 11:01:04 -08:00 · 2025-01-29 11:01:04 -08:00 · efbf5ed08c
commit efbf5ed08c
parent db03bf1d9d
34 changed files with 39 additions and 16 deletions
--- a/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf
+++ b/ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf
@ -47,6 +47,7 @@
  ArmSvcLib
  ArmTransferListLib
  ArmFfaLib
+  StackCheckLib

 [Guids]
  gMpInformationHobGuid
--- a/ArmPlatformPkg/PeilessSec/PeilessSec.inf
+++ b/ArmPlatformPkg/PeilessSec/PeilessSec.inf
@ -51,6 +51,7 @@
  PrintLib
  SerialPortLib
  TimerLib
+  StackCheckLib

 [Ppis]
  gArmMpCoreInfoPpiGuid
--- a/ArmPlatformPkg/Sec/Sec.inf
+++ b/ArmPlatformPkg/Sec/Sec.inf
@ -47,6 +47,7 @@
  DebugLib
  PrintLib
  SerialPortLib
+  StackCheckLib

 [Ppis]
  gEfiTemporaryRamSupportPpiGuid
--- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf
+++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf
@ -54,6 +54,7 @@
  PlatformPeiLib
  MemoryInitPeiLib
  CacheMaintenanceLib
+  StackCheckLib

 [Guids]
  gArmMpCoreInfoGuid
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@ -323,10 +323,7 @@
    # USER_DEFINED components skip normal NULL lib linking, so we have to link this
    # specially here for the libs that have stack guard enabled
    ##
-    EmulatorPkg/Win/Host/WinHost.inf {
-      <LibraryClasses>
-        NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
-    }
+    EmulatorPkg/Win/Host/WinHost.inf
  !else
    ##
    #  Emulator, OS POSIX application
@ -334,10 +331,7 @@
    # USER_DEFINED components skip normal NULL lib linking, so we have to link this
    # specially here for the libs that have stack guard enabled
    ##
-    EmulatorPkg/Unix/Host/Host.inf {
-      <LibraryClasses>
-        NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
-    }
+    EmulatorPkg/Unix/Host/Host.inf
  !endif
 !endif

--- a/EmulatorPkg/Sec/Sec.inf
+++ b/EmulatorPkg/Sec/Sec.inf
@ -40,6 +40,7 @@
  PeiServicesLib
  PpiListLib
  BaseMemoryLib
+  StackCheckLib

 [Ppis]
  gEfiTemporaryRamSupportPpiGuid
--- a/EmulatorPkg/Unix/Host/Host.inf
+++ b/EmulatorPkg/Unix/Host/Host.inf
@ -61,6 +61,7 @@
  PpiListLib
  PeiServicesLib
  PeCoffGetEntryPointLib
+  StackCheckLib

 [Ppis]
  gEfiPeiStatusCodePpiGuid                      # PPI ALWAYS_PRODUCED
--- a/EmulatorPkg/Win/Host/WinHost.inf
+++ b/EmulatorPkg/Win/Host/WinHost.inf
@ -55,6 +55,7 @@
  PpiListLib
  PeiServicesLib
  FrameBufferBltLib
+  StackCheckLib

 [Ppis]
  gEmuThunkPpiGuid
--- a/IntelFsp2Pkg/FspSecCore/Fsp22SecCoreS.inf
+++ b/IntelFsp2Pkg/FspSecCore/Fsp22SecCoreS.inf
@ -52,6 +52,7 @@
  FspSwitchStackLib
  FspCommonLib
  FspSecPlatformLib
+  StackCheckLib

 [Ppis]
  gEfiTemporaryRamSupportPpiGuid                              ## PRODUCES
--- a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
+++ b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
@ -61,6 +61,7 @@
  CpuLib
  FspMultiPhaseLib
  FspPlatformLib
+  StackCheckLib

 [Pcd]
  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase              ## CONSUMES
--- a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreS.inf
+++ b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreS.inf
@ -53,6 +53,7 @@
  FspCommonLib
  FspSecPlatformLib
  FspMultiPhaseLib
+  StackCheckLib

 [Ppis]
  gEfiTemporaryRamSupportPpiGuid                              ## PRODUCES
--- a/IntelFsp2Pkg/FspSecCore/FspSecCoreI.inf
+++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreI.inf
@ -50,5 +50,6 @@
  FspSwitchStackLib
  FspCommonLib
  FspSecPlatformLib
+  StackCheckLib


--- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
+++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
@ -60,6 +60,7 @@
  FspSecPlatformLib
  CpuLib
  FspPlatformLib
+  StackCheckLib

 [Pcd]
  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase              ## CONSUMES
--- a/IntelFsp2Pkg/FspSecCore/FspSecCoreS.inf
+++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreS.inf
@ -52,6 +52,7 @@
  FspSwitchStackLib
  FspCommonLib
  FspSecPlatformLib
+  StackCheckLib

 [Ppis]
  gEfiTemporaryRamSupportPpiGuid                              ## PRODUCES
--- a/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf
+++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf
@ -46,6 +46,7 @@
  FspSwitchStackLib
  FspCommonLib
  FspSecPlatformLib
+  StackCheckLib

 [Pcd]
  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase              ## CONSUMES
--- a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
+++ b/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
@ -44,6 +44,9 @@
  DebugLib
  CpuExceptionHandlerLib
  DebugAgentLib
+  # CapsuleX64 implements its own _ModuleEntryPoint() and does not link against the standard PEIM entrypoint. As a
+  # result, it must include StackCheckLib to resolve the compiler inserted references to stack cookie functionality
+  StackCheckLib

 [Depex]
  FALSE
--- a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
+++ b/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
@ -33,4 +33,5 @@
 [LibraryClasses]
  BaseLib
  DebugLib
+  StackCheckLib

--- a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
+++ b/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
@ -31,4 +31,4 @@
 [LibraryClasses]
  BaseLib
  DebugLib
-
+  StackCheckLib
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
@ -31,4 +31,4 @@

 [LibraryClasses]
  DebugLib
-
+  StackCheckLib
--- a/MdePkg/Library/StackCheckLib/StackCheckLibStaticInit.inf
+++ b/MdePkg/Library/StackCheckLib/StackCheckLibStaticInit.inf
@ -7,11 +7,11 @@

 [Defines]
  INF_VERSION                    = 1.29
-  BASE_NAME                      = StackCheckLibStaticInit
-  FILE_GUID                      = 2b24dc50-e33d-4c9f-8b62-e826f06e483f
+  BASE_NAME                      = StackCheckLib
+  FILE_GUID                      = 1C4CA056-8FEA-413C-89D2-59A7E22847B3
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = NULL
+  LIBRARY_CLASS                  = StackCheckLib

 [Sources]
  StackCheckLibCommonMsvc.c | MSFT
@ -39,8 +39,6 @@

 [LibraryClasses]
  StackCheckFailureHookLib
-  BaseLib
-  DebugLib

 [FixedPcd]
  gEfiMdePkgTokenSpaceGuid.PcdStackCookieExceptionVector
--- a/MdePkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
+++ b/MdePkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
@ -30,3 +30,4 @@
 [LibraryClasses]
  BaseLib
  DebugLib
+  StackCheckLib
--- a/MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf
+++ b/MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf
@ -36,6 +36,7 @@
  BaseLib
  DebugLib
  MmServicesTableLib
+  StackCheckLib

 [Protocols]
  gEfiLoadedImageProtocolGuid      ## SOMETIMES_CONSUMES
--- a/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
+++ b/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
@ -32,4 +32,5 @@
  UefiBootServicesTableLib
  DebugLib
  BaseLib
+  StackCheckLib

--- a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
+++ b/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
@ -36,6 +36,7 @@
  UefiBootServicesTableLib
  DebugLib
  BaseLib
+  StackCheckLib


 [Protocols]
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@ -142,7 +142,7 @@

  MdePkg/Library/StackCheckFailureHookLibNull/StackCheckFailureHookLibNull.inf
  MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
-  MdePkg/Library/StackCheckLib/StackCheckLibStaticInit.inf
+  MdePkg/Library/StackCheckLib/StackCheckLib.inf

 [Components.IA32, Components.X64, Components.ARM, Components.AARCH64]
  #
--- a/OvmfPkg/IntelTdx/Sec/SecMain.inf
+++ b/OvmfPkg/IntelTdx/Sec/SecMain.inf
@ -50,6 +50,7 @@
  PeilessStartupLib
  PlatformInitLib
  CcProbeLib
+  StackCheckLib

 [Pcd]
  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase
--- a/OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.inf
+++ b/OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.inf
@ -31,6 +31,7 @@
  DebugLib
  QemuFwCfgSimpleParserLib
  UefiBootServicesTableLib
+  StackCheckLib

 [Protocols]
  gEfiLoadedImageProtocolGuid                   ## SOMETIMES_CONSUMES
--- a/OvmfPkg/LoongArchVirt/Sec/SecMain.inf
+++ b/OvmfPkg/LoongArchVirt/Sec/SecMain.inf
@ -40,6 +40,7 @@
  PeCoffGetEntryPointLib
  PeCoffExtraActionLib
  PeiServicesLib
+  StackCheckLib

 [Ppis]
  gEfiTemporaryRamSupportPpiGuid                # PPI ALWAYS_PRODUCED
--- a/OvmfPkg/RiscVVirt/Sec/SecMain.inf
+++ b/OvmfPkg/RiscVVirt/Sec/SecMain.inf
@ -49,6 +49,7 @@
  MemoryAllocationLib
  HobLib
  SerialPortLib
+  StackCheckLib

 [Ppis]
  gEfiTemporaryRamSupportPpiGuid                # PPI ALWAYS_PRODUCED
--- a/OvmfPkg/Sec/SecMain.inf
+++ b/OvmfPkg/Sec/SecMain.inf
@ -56,6 +56,7 @@
  CpuExceptionHandlerLib
  CcProbeLib
  CpuPageTableLib
+  StackCheckLib

 [Ppis]
  gEfiTemporaryRamSupportPpiGuid                # PPI ALWAYS_PRODUCED
--- a/UefiCpuPkg/SecCore/SecCore.inf
+++ b/UefiCpuPkg/SecCore/SecCore.inf
@ -56,6 +56,7 @@
  PeiServicesTablePointerLib
  HobLib
  CpuPageTableLib
+  StackCheckLib

 [Ppis]
  ## SOMETIMES_CONSUMES
--- a/UefiCpuPkg/SecCore/SecCoreNative.inf
+++ b/UefiCpuPkg/SecCore/SecCoreNative.inf
@ -53,6 +53,7 @@
  PeiServicesTablePointerLib
  HobLib
  CpuPageTableLib
+  StackCheckLib

 [Ppis]
  ## SOMETIMES_CONSUMES
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
@ -55,6 +55,7 @@
  PeCoffLib
  PlatformSupportLib
  CpuLib
+  StackCheckLib

 [Guids]
  gEfiMemoryTypeInformationGuid
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
@ -47,6 +47,7 @@
  PeCoffLib
  CpuLib
  HobPrintLib
+  StackCheckLib

 [Guids]
  gEfiMemoryTypeInformationGuid