OvmfPkg: enable stack NX in OvmfPkgX64.dsc rather than .dec

Signed-off-by: Jiaqi Gao <jiaqi.gao@intel.com>
tianocore · Dec 9, 2021 · 4bd322d · 4bd322d
1 parent 71db2be
commit 4bd322d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
@@ -338,7 +338,7 @@
   gUefiOvmfPkgTokenSpaceGuid.PcdUseTdxMsr|TRUE|BOOLEAN|0x56
 
   gUefiOvmfPkgTokenSpaceGuid.PcdTdxAcceptChunkSize|0x2000000|UINT64|0x59
-  gUefiOvmfPkgTokenSpaceGuid.PcdTdxSetNxForStack|TRUE|BOOLEAN|0x5b
+  gUefiOvmfPkgTokenSpaceGuid.PcdTdxSetNxForStack|FALSE|BOOLEAN|0x5b
   gUefiOvmfPkgTokenSpaceGuid.PcdTdxPteMemoryEncryptionAddressOrMask|0|UINT64|0x5c
 
   ## The Tdx accept page size. 0x1000,0x200000

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
@@ -637,6 +637,7 @@
   # TDX doesn't allow us to change EFER so make sure these are disabled
   #gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE
+  gUefiOvmfPkgTokenSpaceGuid.PcdTdxSetNxForStack|TRUE
 
   # Set memory encryption mask
   gUefiOvmfPkgTokenSpaceGuid.PcdTdxPteMemoryEncryptionAddressOrMask|0x0