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

[mirror_edk2.git] / UefiCpuPkg / Library / SmmCpuFeaturesLib / X64 / SmiException.nasm

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm b/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm
index b0ab87b0d4e537725a8ea727e252c75e748d6bcb..3e5295986b616904f3d8a07604dd1ab9b572b807 100644 (file)
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm
@@ -18,6 +18,8 @@
 ;\r
 ;-------------------------------------------------------------------------------\r
 \r
+%include "StuffRsb.inc"\r
+\r
 global  ASM_PFX(gcStmPsd)\r
 \r
 extern  ASM_PFX(SmmStmExceptionHandler)\r
@@ -131,7 +133,8 @@ ASM_PFX(OnStmSetup):
     wrmsr\r
 \r
 .11:\r
-  rsm\r
+    StuffRsb64\r
+    rsm\r
 \r
 global ASM_PFX(OnStmTeardown)\r
 ASM_PFX(OnStmTeardown):\r
@@ -175,4 +178,5 @@ ASM_PFX(OnStmTeardown):
     wrmsr\r
 \r
 .12:\r
-  rsm\r
+    StuffRsb64\r
+    rsm\r