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

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

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
index 93dc3005b7b2fdaa1d5f9a228918d5ae47097bbb..bc8dbfe20bcf43d99408a473bb74cad8a6f7d126 100644 (file)
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
@@ -1,5 +1,5 @@
 ;------------------------------------------------------------------------------ ;\r
 ;------------------------------------------------------------------------------ ;\r

-; Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 ; This program and the accompanying materials\r
 ; are licensed and made available under the terms and conditions of the BSD License\r
 ; which accompanies this distribution.  The full text of the license may be found at\r
 ; This program and the accompanying materials\r
 ; are licensed and made available under the terms and conditions of the BSD License\r
 ; which accompanies this distribution.  The full text of the license may be found at\r


@@ -18,6 +18,8 @@
 ;\r
 ;-------------------------------------------------------------------------------\r
 \r
 ;\r
 ;-------------------------------------------------------------------------------\r
 \r

+%include "StuffRsb.inc"\r
+\r

 global  ASM_PFX(gcStmPsd)\r
 \r
 extern  ASM_PFX(SmmStmExceptionHandler)\r
 global  ASM_PFX(gcStmPsd)\r
 \r
 extern  ASM_PFX(SmmStmExceptionHandler)\r


@@ -130,7 +132,8 @@ ASM_PFX(OnStmSetup):
     wrmsr\r
 \r
 .71:\r
     wrmsr\r
 \r
 .71:\r

-  rsm\r
+    StuffRsb32\r
+    rsm\r

 \r
 global  ASM_PFX(OnStmTeardown)\r
 ASM_PFX(OnStmTeardown):\r
 \r
 global  ASM_PFX(OnStmTeardown)\r
 ASM_PFX(OnStmTeardown):\r


@@ -172,4 +175,5 @@ ASM_PFX(OnStmTeardown):
     wrmsr\r
 \r
 .72:\r
     wrmsr\r
 \r
 .72:\r

-  rsm\r
+    StuffRsb32\r
+    rsm\r