UefiCpuPkg/PiSmmCpuDxeSmm: [CVE-2017-5715] Stuff RSB before RSM

[mirror_edk2.git] / UefiCpuPkg / PiSmmCpuDxeSmm / X64 / SmiEntry.nasm

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
index 97c7b01d0db704dd3e752960d606ad8a41a09c05..315d0f8670757f6cdb93e5a5d0ace0c03971cb10 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
@@ -18,6 +18,8 @@
 ;\r
 ;-------------------------------------------------------------------------------\r
 \r
+%include "StuffRsb.inc"\r
+\r
 ;\r
 ; Variables referrenced by C code\r
 ;\r
@@ -217,6 +219,7 @@ _SmiHandler:
     wrmsr\r
 \r
 .1:\r
+    StuffRsb64\r
     rsm\r
 \r
 ASM_PFX(gcSmiHandlerSize)    DW      $ - _SmiEntryPoint\r