Skip to content

Commit ef4f3aa

Browse files
os-dmergify[bot]
os-d
authored and
mergify[bot]
committed
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 <[email protected]>
1 parent fd9e984 commit ef4f3aa

File tree

34 files changed

+10
-118
lines changed

34 files changed

+10
-118
lines changed

‎ArmPkg/ArmPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@
9191

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

94-
[LibraryClasses.common.SEC]
95-
# ARM platforms have SEC modules with standard entry points, so we can generically link StackCheckLib
96-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
97-
9894
[LibraryClasses.common.PEIM]
9995
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
10096
PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

‎ArmPlatformPkg/ArmPlatformPkg.dsc

-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@
8686
MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf
8787
PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf
8888

89-
# ARM platforms have SEC modules with standard entry points, so we can generically link StackCheckLib
90-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
91-
9289
[LibraryClasses.AARCH64.MM_STANDALONE]
9390
HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf
9491
MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf

‎ArmVirtPkg/ArmVirt.dsc.inc

-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@
182182
DebugLib|ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLibFdtPL011UartFlash.inf
183183
!endif
184184

185-
# ARM platforms have SEC modules with standard entry points, so we can generically link StackCheckLib
186-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
187-
188185
[LibraryClasses.common.PEI_CORE]
189186
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
190187
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

‎CryptoPkg/CryptoPkg.dsc

-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@
131131
[LibraryClasses.common.SEC]
132132
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
133133
TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
134-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
135-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
136134

137135
[LibraryClasses.common.PEIM]
138136
PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

‎DynamicTablesPkg/DynamicTablesPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
3535
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
3636

37-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
38-
[LibraryClasses.common.SEC]
39-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
40-
4137
[LibraryClasses.ARM, LibraryClasses.AARCH64]
4238
PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
4339

‎EmbeddedPkg/EmbeddedPkg.dsc

-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@
122122

123123
[LibraryClasses.common.SEC]
124124
ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
125-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
126-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
127125

128126
[LibraryClasses.ARM, LibraryClasses.AARCH64]
129127
ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

‎EmulatorPkg/EmulatorPkg.dsc

-2
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@
151151
PpiListLib|EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf
152152
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
153153
TimerLib|EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf
154-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
155-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
156154

157155
[LibraryClasses.common.USER_DEFINED, LibraryClasses.common.BASE]
158156
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

‎FatPkg/FatPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@
4949
DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
5050
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
5151

52-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
53-
[LibraryClasses.common.SEC]
54-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
55-
5652
[LibraryClasses.common.PEIM]
5753
PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
5854
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

‎IntelFsp2Pkg/IntelFsp2Pkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
FspSecPlatformLib|IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/SecFspSecPlatformLibNull.inf
4747
FspMultiPhaseLib|IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
4848

49-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
50-
[LibraryClasses.common.SEC]
51-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
52-
5349
[LibraryClasses.common.PEIM, LibraryClasses.common.SEC]
5450
PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
5551
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

‎IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@
5757

5858
Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
5959

60-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
61-
[LibraryClasses.common.SEC]
62-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
63-
6460
[LibraryClasses.common.PEIM,LibraryClasses.common.PEI_CORE]
6561
PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
6662
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

‎MdeModulePkg/MdeModulePkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@
109109
IpmiCommandLib|MdeModulePkg/Library/BaseIpmiCommandLibNull/BaseIpmiCommandLibNull.inf
110110
SpiHcPlatformLib|MdeModulePkg/Library/BaseSpiHcPlatformLibNull/BaseSpiHcPlatformLibNull.inf
111111

112-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
113-
[LibraryClasses.common.SEC]
114-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
115-
116112
[LibraryClasses.EBC.PEIM]
117113
IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
118114

‎MdePkg/MdeLibs.dsc.inc

+8-13
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@
2020
SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
2121
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
2222
MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf
23+
StackCheckFailureHookLib|MdePkg/Library/StackCheckFailureHookLibNull/StackCheckFailureHookLibNull.inf
24+
25+
!ifndef CUSTOM_STACK_CHECK_LIB
26+
# If CUSTOM_STACK_CHECK_LIB is set, MdeLibs.dsc.inc will not link StackCheckLibNull and it is expected that the
27+
# DSC being built is providing it's own implementation of StackCheckLib.
28+
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
29+
30+
!endif
2331
2432
[LibraryClasses.ARM, LibraryClasses.AARCH64]
2533
#
@@ -30,16 +38,3 @@
3038
# definitions for the intrinsic functions.
3139
#
3240
NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
33-
34-
#
35-
# Stack Cookies cannot be generically applied to SEC modules because they may not define _ModuleEntryPoint and when we
36-
# link a library in, we have to be able to define the entry point. SEC modules that do define _ModuleEntryPoint can
37-
# apply a library class override to get StackCheckLibNull.inf.
38-
#
39-
# If CUSTOM_STACK_CHECK_LIB is set, MdeLibs.dsc.inc will not link StackCheckLibNull and it is expected that the
40-
# DSC being built is providing it's own implementation of StackCheckLib.
41-
#
42-
[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]
43-
!ifndef CUSTOM_STACK_CHECK_LIB
44-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
45-
!endif

‎NetworkPkg/NetworkPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
6363
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
6464

65-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
66-
[LibraryClasses.common.SEC]
67-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
68-
6965
[LibraryClasses.common.UEFI_DRIVER]
7066
HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
7167
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

‎OvmfPkg/AmdSev/AmdSevX64.dsc

-3
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,6 @@
232232
CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf
233233
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
234234

235-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
236-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
237-
238235
[LibraryClasses.common.PEI_CORE]
239236
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
240237
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

‎OvmfPkg/Bhyve/BhyveX64.dsc

-3
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,6 @@
256256
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
257257
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
258258

259-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
260-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
261-
262259
[LibraryClasses.common.PEI_CORE]
263260
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
264261
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

‎OvmfPkg/CloudHv/CloudHvX64.dsc

-3
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,6 @@
269269
CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf
270270
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
271271

272-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
273-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
274-
275272
[LibraryClasses.common.PEI_CORE]
276273
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
277274
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

‎OvmfPkg/IntelTdx/IntelTdxX64.dsc

-3
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,6 @@
240240
PeilessStartupLib|OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf
241241
CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf
242242

243-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
244-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
245-
246243
[LibraryClasses.common.DXE_CORE]
247244
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
248245
DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

‎OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc

-3
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,6 @@
194194
PlatformHookLib | OvmfPkg/LoongArchVirt/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.inf
195195
CpuExceptionHandlerLib | UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
196196

197-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
198-
NULL | MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
199-
200197
[LibraryClasses.common.PEI_CORE]
201198
PcdLib | MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
202199
HobLib | MdePkg/Library/PeiHobLib/PeiHobLib.inf

‎OvmfPkg/Microvm/MicrovmX64.dsc

-3
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,6 @@
277277
CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf
278278
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf
279279

280-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
281-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
282-
283280
[LibraryClasses.common.PEI_CORE]
284281
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
285282
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf

‎OvmfPkg/OvmfPkgIa32.dsc

-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,6 @@
683683
OvmfPkg/Sec/SecMain.inf {
684684
<LibraryClasses>
685685
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
686-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
687686
}
688687

689688
#

‎OvmfPkg/OvmfPkgIa32X64.dsc

-1
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,6 @@
695695
OvmfPkg/Sec/SecMain.inf {
696696
<LibraryClasses>
697697
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
698-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
699698
}
700699

701700
#

‎OvmfPkg/OvmfPkgX64.dsc

-1
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,6 @@
716716
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
717717
NULL|OvmfPkg/IntelTdx/TdxHelperLib/SecTdxHelperLib.inf
718718
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf
719-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
720719
}
721720

722721
#

‎OvmfPkg/OvmfXen.dsc

-1
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@
525525
OvmfPkg/Sec/SecMain.inf {
526526
<LibraryClasses>
527527
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
528-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
529528
}
530529

531530
#

‎OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc

-3
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,6 @@
152152
PrePiHobListPointerLib|OvmfPkg/RiscVVirt/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf
153153
MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf
154154

155-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
156-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
157-
158155
[LibraryClasses.common.DXE_CORE]
159156
PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
160157
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

‎PcAtChipsetPkg/PcAtChipsetPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
4646
HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
4747

48-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
49-
[LibraryClasses.common.SEC]
50-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
51-
5248
[Components]
5349
PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
5450
PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf

‎PrmPkg/PrmPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@
4040
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
4141
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
4242

43-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
44-
[LibraryClasses.common.SEC]
45-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
46-
4743
[LibraryClasses.IA32, LibraryClasses.X64]
4844
MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
4945

‎RedfishPkg/RedfishPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@
5252
IpmiLib|MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf
5353
IpmiCommandLib|MdeModulePkg/Library/BaseIpmiCommandLibNull/BaseIpmiCommandLibNull.inf
5454

55-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
56-
[LibraryClasses.common.SEC]
57-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
58-
5955
[LibraryClasses.ARM, LibraryClasses.AARCH64]
6056
ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
6157

‎SecurityPkg/SecurityPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@
8989
PlatformLibWrapper|SecurityPkg/DeviceSecurity/OsStub/PlatformLibWrapper/PlatformLibWrapper.inf
9090
MemLibWrapper|SecurityPkg/DeviceSecurity/OsStub/MemLibWrapper/MemLibWrapper.inf
9191

92-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
93-
[LibraryClasses.common.SEC]
94-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
95-
9692
[LibraryClasses.ARM, LibraryClasses.AARCH64]
9793
ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
9894

‎ShellPkg/ShellPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@
6767

6868
SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
6969

70-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
71-
[LibraryClasses.common.SEC]
72-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
73-
7470
[PcdsFixedAtBuild]
7571
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
7672
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|16000

‎SignedCapsulePkg/SignedCapsulePkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@
9595
PlatformFlashAccessLib|SignedCapsulePkg/Library/PlatformFlashAccessLibNull/PlatformFlashAccessLibNull.inf
9696
RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf
9797

98-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
99-
[LibraryClasses.common.SEC]
100-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
101-
10298
[LibraryClasses.ARM]
10399
ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
104100

‎SourceLevelDebugPkg/SourceLevelDebugPkg.dsc

-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@
5252
!endif
5353
!endif
5454

55-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
56-
[LibraryClasses.common.SEC]
57-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
58-
5955
[LibraryClasses.common.PEIM]
6056
PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
6157
PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

‎UefiCpuPkg/UefiCpuPkg.dsc

+2-8
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,8 @@
173173
UefiCpuPkg/Library/AmdSvsmLibNull/AmdSvsmLibNull.inf
174174
UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
175175
UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
176-
UefiCpuPkg/SecCore/SecCore.inf {
177-
<LibraryClasses>
178-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
179-
}
180-
UefiCpuPkg/SecCore/SecCoreNative.inf {
181-
<LibraryClasses>
182-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
183-
}
176+
UefiCpuPkg/SecCore/SecCore.inf
177+
UefiCpuPkg/SecCore/SecCoreNative.inf
184178
UefiCpuPkg/SecMigrationPei/SecMigrationPei.inf
185179
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
186180
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {

‎UefiPayloadPkg/UefiPayloadPkg.dsc

-3
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,6 @@
372372
SerialPortLib|UefiPayloadPkg/Library/BaseSerialPortLibHob/BaseSerialPortLibHob.inf
373373
!endif
374374

375-
# StackCheckLib is not linked for SEC modules by default, this package can link it against its SEC modules
376-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
377-
378375
[LibraryClasses.common.DXE_CORE]
379376
DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLibNull/DxeHobListLibNull.inf
380377
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

‎UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
UnitTestLib|UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.inf
2929
UnitTestPersistenceLib|UnitTestFrameworkPkg/Library/UnitTestPersistenceLibNull/UnitTestPersistenceLibNull.inf
3030
UnitTestResultReportLib|UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibDebugLib.inf
31-
NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf
3231

3332
[LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]
3433
NULL|UnitTestFrameworkPkg/Library/UnitTestDebugAssertLib/UnitTestDebugAssertLib.inf

0 commit comments

Comments
 (0)