Changeset 80489 in vbox

Timestamp:

Aug 29, 2019 7:53:55 AM (5 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Fix zero-ing out incorrectly the exit int. info and IDT info for NMI VM-exits.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (2 diffs)
• IEMAllCImplVmxInstr.cpp.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -15773 +15773 @@
     Assert(pExitInfo);
     Assert(pExitEventInfo);
-    Assert(pExitInfo->uReason == VMX_EXIT_XCPT_OR_NMI);
     VBOXSTRICTRC rcStrict = iemVmxVmexitEventWithInfo(pVCpu, pExitInfo, pExitEventInfo);
     Assert(!pVCpu->iem.s.cActiveMappings);
@@ -15791 +15790 @@
     VMXVEXITINFO ExitInfo;
     RT_ZERO(ExitInfo);
+    ExitInfo.uReason = VMX_EXIT_XCPT_OR_NMI;
+
     VMXVEXITEVENTINFO ExitEventInfo;
-    RT_ZERO(ExitInfo);
+    RT_ZERO(ExitEventInfo);
     ExitEventInfo.uExitIntInfo = RT_BF_MAKE(VMX_BF_EXIT_INT_INFO_VALID,  1)
                                | RT_BF_MAKE(VMX_BF_EXIT_INT_INFO_TYPE,   VMX_EXIT_INT_INFO_TYPE_NMI)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -3605 +3605 @@
     Assert(pExitInfo);
     Assert(pExitEventInfo);
+    Assert(pExitInfo->uReason == VMX_EXIT_XCPT_OR_NMI);
     Assert(VMX_EXIT_INT_INFO_IS_VALID(pExitEventInfo->uExitIntInfo));