Changeset 47066 in vbox for trunk

Timestamp:

Jul 10, 2013 9:50:29 AM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: More validations for the error code valid bit.

File:

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

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

@@ -6430 +6430 @@
     const uint32_t uIntrType = VMX_EXIT_INTERRUPTION_INFO_TYPE(u32IntrInfo);
 
+#ifdef VBOX_STRICT
+    /* Validate the error-code-valid bit for hardware exceptions. */
+    if (uIntrType == VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT)
+    {
+        switch (uVector)
+        {
+            case X86_XCPT_PF:
+            case X86_XCPT_DF:
+            case X86_XCPT_TS:
+            case X86_XCPT_NP:
+            case X86_XCPT_SS:
+            case X86_XCPT_GP:
+            case X86_XCPT_AC:
+                AssertMsg(VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID(u32IntrInfo),
+                          ("Error-code-valid bit not set for exception that has an error code uVector=%#x\n", uVector));
+                /* fallthru */
+            default:
+                break;
+        }
+    }
+#endif
+
     /* Cannot inject an NMI when block-by-MOV SS is in effect. */
     Assert(   uIntrType != VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI
@@ -6481 +6503 @@
             /* Software exceptions (#BP and #OF exceptions thrown as a result of INT3 or INTO) */
             uint16_t uGuestIp = pMixedCtx->ip;
-            if (VMX_EXIT_INTERRUPTION_INFO_TYPE(u32IntrInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT)
+            if (uIntrType == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT)
             {
                 Assert(uVector == X86_XCPT_BP || uVector == X86_XCPT_OF);
@@ -6487 +6509 @@
                 uGuestIp = pMixedCtx->ip + (uint16_t)cbInstr;
             }
-            else if (VMX_EXIT_INTERRUPTION_INFO_TYPE(u32IntrInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT)
+            else if (uIntrType == VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT)
                 uGuestIp = pMixedCtx->ip + (uint16_t)cbInstr;
 
@@ -6511 +6533 @@
                 pMixedCtx->cs.Sel      = selIdtEntry;
                 pMixedCtx->cs.u64Base  = selIdtEntry << cbIdtEntry;
-                if (   VMX_EXIT_INTERRUPTION_INFO_TYPE(u32IntrInfo) == VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT
-                    && uVector == X86_XCPT_PF)
+                if (   uIntrType == VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT
+                    && uVector   == X86_XCPT_PF)
                 {
                     pMixedCtx->cr2 = GCPtrFaultAddress;