MdePkg: MdeLibs.dsc.inc: Apply StackCheckLibNull to All Module Types

Now that the ResetVectors are USER_DEFINED modules, they will not
be linked against StackCheckLibNull, which were the only modules
causing issues. So, we can now remove the kludge we had before
and the requirement for every DSC to include StackCheckLibNull
for SEC modules and just apply StackCheckLibNull globally.

This also changes every DSC to drop the SEC definition of
StackCheckLibNull.

Continuous-integration-options: PatchCheck.ignore-multi-package

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>

34 files changed, 10 insertions, 118 deletions

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 25d750e..4a06038 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -91,10 +91,6 @@
 

   OemMiscLib|ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf

 

-[LibraryClasses.common.SEC]

-  # ARM platforms have SEC modules with standard entry points, so we can generically link StackCheckLib

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEIM]

   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf

   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc
index bfe1b99..15d7484 100644
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -86,9 +86,6 @@
   MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf

   PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf

 

-  # ARM platforms have SEC modules with standard entry points, so we can generically link StackCheckLib

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.AARCH64.MM_STANDALONE]

   HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf

   MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 6dd6ce6..5384a41 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -182,9 +182,6 @@
   DebugLib|ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLibFdtPL011UartFlash.inf

 !endif

 

-  # ARM platforms have SEC modules with standard entry points, so we can generically link StackCheckLib

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEI_CORE]

   PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 8492f91..d082043 100644
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -131,8 +131,6 @@
 [LibraryClasses.common.SEC]

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf

   TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

 

 [LibraryClasses.common.PEIM]

   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

diff --git a/DynamicTablesPkg/DynamicTablesPkg.dsc b/DynamicTablesPkg/DynamicTablesPkg.dsc
index 8cac9d5..d9b4366 100644
--- a/DynamicTablesPkg/DynamicTablesPkg.dsc
+++ b/DynamicTablesPkg/DynamicTablesPkg.dsc
@@ -34,10 +34,6 @@
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.ARM, LibraryClasses.AARCH64]

   PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf

 

diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index d0254c1..503d313 100644
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -122,8 +122,6 @@
 

 [LibraryClasses.common.SEC]

   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

 

 [LibraryClasses.ARM, LibraryClasses.AARCH64]

   ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index e4bf3ce..d9aac2b 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -151,8 +151,6 @@
   PpiListLib|EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf

   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

   TimerLib|EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

 

 [LibraryClasses.common.USER_DEFINED, LibraryClasses.common.BASE]

   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

diff --git a/FatPkg/FatPkg.dsc b/FatPkg/FatPkg.dsc
index 76dddaa..49b4221 100644
--- a/FatPkg/FatPkg.dsc
+++ b/FatPkg/FatPkg.dsc
@@ -49,10 +49,6 @@
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEIM]

   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.dsc b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
index ea61c5d..991ab01 100644
--- a/IntelFsp2Pkg/IntelFsp2Pkg.dsc
+++ b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
@@ -46,10 +46,6 @@
   FspSecPlatformLib|IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/SecFspSecPlatformLibNull.inf

   FspMultiPhaseLib|IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEIM, LibraryClasses.common.SEC]

   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
index f904e6f..fe62124 100644
--- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
@@ -57,10 +57,6 @@
 

   Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-   NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEIM,LibraryClasses.common.PEI_CORE]

   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index f8204f7..ebceafc 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -109,10 +109,6 @@
   IpmiCommandLib|MdeModulePkg/Library/BaseIpmiCommandLibNull/BaseIpmiCommandLibNull.inf

   SpiHcPlatformLib|MdeModulePkg/Library/BaseSpiHcPlatformLibNull/BaseSpiHcPlatformLibNull.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.EBC.PEIM]

   IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf

 

diff --git a/MdePkg/MdeLibs.dsc.inc b/MdePkg/MdeLibs.dsc.inc
index 542b5f7..19a883d 100644
--- a/MdePkg/MdeLibs.dsc.inc
+++ b/MdePkg/MdeLibs.dsc.inc
@@ -20,6 +20,14 @@
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf

   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf

   MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf

+  StackCheckFailureHookLib|MdePkg/Library/StackCheckFailureHookLibNull/StackCheckFailureHookLibNull.inf

+

+!ifndef CUSTOM_STACK_CHECK_LIB

+  # If CUSTOM_STACK_CHECK_LIB is set, MdeLibs.dsc.inc will not link StackCheckLibNull and it is expected that the

+  # DSC being built is providing it's own implementation of StackCheckLib.

+  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

+

+!endif

 

 [LibraryClasses.ARM, LibraryClasses.AARCH64]

   #

@@ -30,16 +38,3 @@
   # definitions for the intrinsic functions.

   #

   NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf

-

-#

-# Stack Cookies cannot be generically applied to SEC modules because they may not define _ModuleEntryPoint and when we

-# link a library in, we have to be able to define the entry point. SEC modules that do define _ModuleEntryPoint can

-# apply a library class override to get StackCheckLibNull.inf.

-#

-# If CUSTOM_STACK_CHECK_LIB is set, MdeLibs.dsc.inc will not link StackCheckLibNull and it is expected that the

-# DSC being built is providing it's own implementation of StackCheckLib.

-#

-[LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM, LibraryClasses.common.DXE_CORE, LibraryClasses.common.SMM_CORE, LibraryClasses.common.MM_CORE_STANDALONE, LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_SMM_DRIVER, LibraryClasses.common.MM_STANDALONE, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION]

-!ifndef CUSTOM_STACK_CHECK_LIB

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-!endif

diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc
index f008790..3a7021e 100644
--- a/NetworkPkg/NetworkPkg.dsc
+++ b/NetworkPkg/NetworkPkg.dsc
@@ -62,10 +62,6 @@
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.UEFI_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index 1f5837d..40553c0 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -232,9 +232,6 @@
   CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf

   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf

 

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEI_CORE]

   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf

   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
index f32ce17..3bcbae6 100644
--- a/OvmfPkg/Bhyve/BhyveX64.dsc
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
@@ -256,9 +256,6 @@
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf

   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf

 

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEI_CORE]

   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf

   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index b970c07..38137d8 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -269,9 +269,6 @@
   CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf

   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf

 

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEI_CORE]

   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf

   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
index fbda01b..fc13325 100644
--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
@@ -240,9 +240,6 @@
   PeilessStartupLib|OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf

   CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf

 

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.DXE_CORE]

   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

   DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

diff --git a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
index b5b36ad..e49bbf3 100644
--- a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
+++ b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
@@ -194,9 +194,6 @@
   PlatformHookLib                  | OvmfPkg/LoongArchVirt/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.inf

   CpuExceptionHandlerLib           | UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf

 

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL                             | MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEI_CORE]

   PcdLib                           | MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   HobLib                           | MdePkg/Library/PeiHobLib/PeiHobLib.inf

diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 241c930..bc9be1c 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -277,9 +277,6 @@
   CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf

   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf

 

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEI_CORE]

   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf

   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 07c10db..7ab6af3 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -683,7 +683,6 @@
   OvmfPkg/Sec/SecMain.inf {

     <LibraryClasses>

       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

-      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

   }

 

   #

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index aabe96b..e7fff78 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -695,7 +695,6 @@
   OvmfPkg/Sec/SecMain.inf {

     <LibraryClasses>

       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

-      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

   }

 

   #

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 0f57058..556984b 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -716,7 +716,6 @@
       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

       NULL|OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelperLib.inf

       BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf

-      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

   }

 

   #

diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index 806ff3d..5e845e5 100644
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -525,7 +525,6 @@
   OvmfPkg/Sec/SecMain.inf {

     <LibraryClasses>

       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

-      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

   }

 

   #

diff --git a/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
index b7ab32f..44ddb18 100644
--- a/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
+++ b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
@@ -152,9 +152,6 @@
   PrePiHobListPointerLib|OvmfPkg/RiscVVirt/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf

   MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf

 

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.DXE_CORE]

   PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf

   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dsc b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
index 73f8198..2f02ecf 100644
--- a/PcAtChipsetPkg/PcAtChipsetPkg.dsc
+++ b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
@@ -45,10 +45,6 @@
   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [Components]

   PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf

   PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf

diff --git a/PrmPkg/PrmPkg.dsc b/PrmPkg/PrmPkg.dsc
index 8eeb393..83d1f43 100644
--- a/PrmPkg/PrmPkg.dsc
+++ b/PrmPkg/PrmPkg.dsc
@@ -40,10 +40,6 @@
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.IA32, LibraryClasses.X64]

   MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf

 

diff --git a/RedfishPkg/RedfishPkg.dsc b/RedfishPkg/RedfishPkg.dsc
index 97f2059..3b1a026 100644
--- a/RedfishPkg/RedfishPkg.dsc
+++ b/RedfishPkg/RedfishPkg.dsc
@@ -52,10 +52,6 @@
   IpmiLib|MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf

   IpmiCommandLib|MdeModulePkg/Library/BaseIpmiCommandLibNull/BaseIpmiCommandLibNull.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.ARM, LibraryClasses.AARCH64]

   ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf

 

diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
index f6a3f49..21899a5 100644
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/SecurityPkg/SecurityPkg.dsc
@@ -89,10 +89,6 @@
   PlatformLibWrapper|SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.inf

   MemLibWrapper|SecurityPkg/DeviceSecurity/OsStub/MemLibWrapper/MemLibWrapper.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.ARM, LibraryClasses.AARCH64]

   ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf

 

diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 5303a68..7e985f8 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -67,10 +67,6 @@
 

   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [PcdsFixedAtBuild]

   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF

   gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|16000

diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/SignedCapsulePkg.dsc
index 1217d24..dcb3fcf 100644
--- a/SignedCapsulePkg/SignedCapsulePkg.dsc
+++ b/SignedCapsulePkg/SignedCapsulePkg.dsc
@@ -95,10 +95,6 @@
   PlatformFlashAccessLib|SignedCapsulePkg/Library/PlatformFlashAccessLibNull/PlatformFlashAccessLibNull.inf

   RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.ARM]

   ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf

 

diff --git a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
index 1b9a99b..986dd5a 100644
--- a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
+++ b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
@@ -52,10 +52,6 @@
 !endif

 !endif

 

-# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-[LibraryClasses.common.SEC]

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.PEIM]

   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
index d7f8e42..951c4d3 100644
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/UefiCpuPkg/UefiCpuPkg.dsc
@@ -173,14 +173,8 @@
   UefiCpuPkg/Library/AmdSvsmLibNull/AmdSvsmLibNull.inf

   UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf

   UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf

-  UefiCpuPkg/SecCore/SecCore.inf {

-    <LibraryClasses>

-      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-  }

-  UefiCpuPkg/SecCore/SecCoreNative.inf {

-    <LibraryClasses>

-      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-  }

+  UefiCpuPkg/SecCore/SecCore.inf

+  UefiCpuPkg/SecCore/SecCoreNative.inf

   UefiCpuPkg/SecMigrationPei/SecMigrationPei.inf

   UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf

   UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 61b5f8f..9ff326a 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -372,9 +372,6 @@
   SerialPortLib|UefiPayloadPkg/Library/BaseSerialPortLibHob/BaseSerialPortLibHob.inf

 !endif

 

-  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

-

 [LibraryClasses.common.DXE_CORE]

   DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLibNull/DxeHobListLibNull.inf

   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc b/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc
index c0c546d..65e9482 100644
--- a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc
+++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc
@@ -28,7 +28,6 @@
   UnitTestLib|UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.inf

   UnitTestPersistenceLib|UnitTestFrameworkPkg/Library/UnitTestPersistenceLibNull/UnitTestPersistenceLibNull.inf

   UnitTestResultReportLib|UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibDebugLib.inf

-  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf

 

 [LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]

   NULL|UnitTestFrameworkPkg/Library/UnitTestDebugAssertLib/UnitTestDebugAssertLib.inf