Changeset 78615 in vbox for trunk/src/VBox

Timestamp:

May 21, 2019 6:41:34 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Need to zero-out VMX-transient fields for change done in r130680 which might skip it.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -12534 +12534 @@
             {
                 /*
-                 * INS/OUTS (String I/O) instructions gives us additional information
-                 * when the feature is supported (by the CPU and exposed to the guest).
+                 * IN/OUT instruction:
+                 *   - Provides VM-exit instruction length.
                  *
-                 * Instruction length is available for IN/OUT as well as INS/OUTS.
+                 * INS/OUTS instruction:
+                 *   - Provides VM-exit instruction length.
+                 *   - Provides Guest-linear address.
+                 *   - Optionally provides VM-exit instruction info (depends on CPU feature).
                  */
                 PVM pVM = pVCpu->CTX_SUFF(pVM);
                 rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
                 AssertRCReturn(rc, rc);
+
+                /* Make sure we don't use stale VMX-transient info. */
+                pVmxTransient->ExitInstrInfo.u  = 0;
+                pVmxTransient->uGuestLinearAddr = 0;
 
                 bool const fVmxInsOutsInfo = pVM->cpum.ro.GuestFeatures.fVmxInsOutInfo;
@@ -12553 +12560 @@
                         rc |= hmR0VmxReadExitInstrInfoVmcs(pVmxTransient);
                     }
-                    else
-                        pVmxTransient->ExitInstrInfo.u  = 0;
                 }
-                else
-                    pVmxTransient->uGuestLinearAddr = 0;
                 AssertRCReturn(rc, rc);