Changeset 73726 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 17, 2018 6:00:28 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Check physical address limit on the VMXON region pointer better.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (4 diffs)

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

@@ -31 +31 @@
 
 /**
- * Gets the ModR/M and displacement byte(s) from decoded opcodes given their
+ * Gets the ModR/M, SIB and displacement byte(s) from decoded opcodes given their
  * relative offsets.
  */
@@ -43 +43 @@
 #  define IEM_DISP_GET_S32_SX_U64(a_pVCpu, a_u64Disp, a_offDisp)  do { } while (0)
 #  define IEM_DISP_GET_S8_SX_U64(a_pVCpu, a_u64Disp, a_offDisp)   do { } while (0)
-#  error "Implement me: Getting ModR/M, disp. has to work even when the instruction crosses a page boundary."
+#  error "Implement me: Getting ModR/M, SIB, displacement needs to work even when instruction crosses a page boundary."
 # else  /* !IEM_WITH_CODE_TLB */
 #  define IEM_MODRM_GET_U8(a_pVCpu, a_bModRm, a_offModRm) \
@@ -564 +564 @@
         }
 
+        /* VMXON physical-address width limits. */
+        Assert(!VMX_V_VMCS_PHYSADDR_4G_LIMIT);
+        if (GCPhysVmxon >> IEM_GET_GUEST_CPU_FEATURES(pVCpu)->cMaxPhysAddrWidth)
+        {
+            Log(("vmxon: VMXON region pointer extends beyond physical-address width -> VMFailInvalid\n"));
+            pVCpu->cpum.GstCtx.hwvirt.vmx.enmInstrDiag = kVmxVInstrDiag_Vmxon_PtrWidth;
+            iemVmxVmFailInvalid(pVCpu);
+            iemRegAddToRipAndClearRF(pVCpu, cbInstr);
+            return VINF_SUCCESS;
+        }
+
         /* Ensure VMXON region is not MMIO, ROM etc. This is not an Intel requirement but a
            restriction imposed by our implementation. */
@@ -583 +594 @@
             pVCpu->cpum.GstCtx.hwvirt.vmx.enmInstrDiag = kVmxVInstrDiag_Vmxon_PtrReadPhys;
             return rc;
-        }
-
-        /* Physical-address width. */
-        uint64_t const uMsrBasic = CPUMGetGuestIa32VmxBasic(pVCpu);
-        if (   RT_BF_GET(uMsrBasic, VMX_BF_BASIC_PHYSADDR_WIDTH)
-            && RT_HI_U32(GCPhysVmxon))
-        {
-            Log(("vmxon: VMXON region pointer extends beyond physical-address width -> VMFailInvalid\n"));
-            pVCpu->cpum.GstCtx.hwvirt.vmx.enmInstrDiag = kVmxVInstrDiag_Vmxon_PtrWidth;
-            iemVmxVmFailInvalid(pVCpu);
-            iemRegAddToRipAndClearRF(pVCpu, cbInstr);
-            return VINF_SUCCESS;
         }