OvmfPkg: Add StackCheckLibNull

Remove the old stack check lib now that MdeLibs.inc includes
the new one.

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

diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index 40553c00198debe430e281844419e3cb36a91b2a..1f5837d6e72311e2db300a6a48fb0efbfc1cccc0 100644 (file)
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -232,6 +232,9 @@
   CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf\r
   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf\r
 \r
+  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules\r
+  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
+\r
 [LibraryClasses.common.PEI_CORE]\r
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r

diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
index 0689d6442f69e5b795b822f3343d868fc48b960d..2f5fb46a2e67ec1d5bfd4dfbb366d319144cc8fa 100644 (file)
--- a/OvmfPkg/Bhyve/BhyveX64.dsc
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
@@ -256,6 +256,9 @@
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf\r
   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf\r
 \r
+  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules\r
+  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
+\r
 [LibraryClasses.common.PEI_CORE]\r
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r

diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index 3dcefb189623e07c1d6b56e3e8fc84a3b3b02532..1a8d3c4911cfbb7cda13ac3fe34852e9ff82e5b1 100644 (file)
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -269,6 +269,9 @@
   CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf\r
   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf\r
 \r
+  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules\r
+  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
+\r
 [LibraryClasses.common.PEI_CORE]\r
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r

diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
index fc1332598e24d5fe8df6d574b5f3b83a6edfee00..fbda01bd7582a3e08cf6cbead3e353c9573f762e 100644 (file)
--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
@@ -240,6 +240,9 @@
   PeilessStartupLib|OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf\r
   CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf\r
 \r
+  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules\r
+  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
+\r
 [LibraryClasses.common.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
   DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf\r

diff --git a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
index 9064058bc510470912f904a89a5ff19e80436bcc..755892737b12fd48efd9f45bbbb1878be1bcd1bc 100644 (file)
--- a/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
+++ b/OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc
@@ -102,9 +102,6 @@
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
 !endif\r
 \r
-  # For stack protector support\r
-  NULL                             | MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf\r
-\r
   BaseLib                          | MdePkg/Library/BaseLib/BaseLib.inf\r
   SafeIntLib                       | MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf\r
   TimeBaseLib                      | EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf\r
@@ -197,6 +194,9 @@
   PlatformHookLib                  | OvmfPkg/LoongArchVirt/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.inf\r
   CpuExceptionHandlerLib           | UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf\r
 \r
+  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules\r
+  NULL                             | MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
+\r
 [LibraryClasses.common.PEI_CORE]\r
   PcdLib                           | MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
   HobLib                           | MdePkg/Library/PeiHobLib/PeiHobLib.inf\r

diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 1196ba98c90ed5f1bcf38f543641c028a98241fa..6fe8dfd2880e7b6078e8b88206c21ba94a4a06e9 100644 (file)
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -277,6 +277,9 @@
   CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf\r
   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf\r
 \r
+  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules\r
+  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
+\r
 [LibraryClasses.common.PEI_CORE]\r
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 3f68d4d63b72bdeb8aa84d31c9f9448667df7733..5e2086eb3309e18883dfb6df49418e4426283c15 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -686,6 +686,7 @@
   OvmfPkg/Sec/SecMain.inf {\r
     <LibraryClasses>\r
       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
   }\r
 \r
   #\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 67730b0f90b86d52fee8f58728820068b58cf890..ef04ae21a734521bf7a8d131002c63e822e6b01c 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -699,6 +699,7 @@
   OvmfPkg/Sec/SecMain.inf {\r
     <LibraryClasses>\r
       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
   }\r
 \r
   #\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index f4ff2e321a097dfabbd3dd14411d880306e4358b..e7fc7a9410f2109b1ffe23ac21ce47b9eb754ce6 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -720,6 +720,7 @@
       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
       NULL|OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelperLib.inf\r
       BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf\r
+      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
   }\r
 \r
   #\r

diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index f6846c20ff407ed020668be497cf89653ffbfee0..ac7d18196909b909e375cd56a4d5aa85c1865c43 100644 (file)
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -525,6 +525,7 @@
   OvmfPkg/Sec/SecMain.inf {\r
     <LibraryClasses>\r
       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+      NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
   }\r
 \r
   #\r

diff --git a/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
index 30e51790aca186569ddbd9b7dd2e4d742177eca2..9cf743c842bc4c5d96123b72514400e8ccb27213 100644 (file)
--- a/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
+++ b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
@@ -76,10 +76,6 @@
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
 !endif\r
 \r
-\r
-  # Add support for GCC stack protector\r
-  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf\r
-\r
   # RISC-V Architectural Libraries\r
   CpuExceptionHandlerLib|UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandlerLib/BaseRiscV64CpuExceptionHandlerLib.inf\r
   RiscVSbiLib|MdePkg/Library/BaseRiscVSbiLib/BaseRiscVSbiLib.inf\r
@@ -156,6 +152,9 @@
   PrePiHobListPointerLib|OvmfPkg/RiscVVirt/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf\r
   MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf\r
 \r
+  # StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules\r
+  NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf\r
+\r
 [LibraryClasses.common.DXE_CORE]\r
   PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r