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

Timestamp:

May 2, 2013 11:56:42 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: A few extra segment selector checks.

File:

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

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

@@ -3173 +3173 @@
             AssertMsgFailed(("Invalid CS Type %#x\n", pCtx->cs.Attr.n.u2Dpl));
         /* SS */
+        Assert((pCtx->ss.Sel & X86_SEL_RPL) == (pCtx->cs.Sel & X86_SEL_RPL));
+        Assert(pCtx->ss.Attr.n.u2Dpl == (pCtx->ss.Sel & X86_SEL_RPL));
+        Assert(!(pVCpu->hm.s.fContextUseFlags & HM_CHANGED_GUEST_CR0));
+        if (   !(pCtx->cr0 & X86_CR0_PE)
+            || pCtx->cs.Attr.n.u4Type == 3)
+        {
+            Assert(!pCtx->ss.Attr.n.u2Dpl);
+        }
         if (pCtx->ss.Attr.u && pCtx->ss.Attr.u != HMVMX_SEL_UNUSABLE)
         {
@@ -3185 +3193 @@
                    || (pCtx->ss.Attr.n.u1Granularity));
         }
-        Assert(pCtx->ss.Attr.n.u2Dpl == (pCtx->ss.Sel & X86_SEL_RPL));
-        Assert(!(pVCpu->hm.s.fContextUseFlags & HM_CHANGED_GUEST_CR0));
-        if (!pCtx->cr0 & X86_CR0_PE)
-            Assert(!pCtx->ss.Attr.n.u2Dpl);
         /* DS, ES, FS, GS - only check for usable selectors, see hmR0VmxWriteSegmentReg(). */
         if (pCtx->ds.Attr.u && pCtx->ds.Attr.u != HMVMX_SEL_UNUSABLE)
@@ -5149 +5153 @@
     /*
      * If VT-x marks the segment as unusable, the rest of the attributes are undefined.
-     * See Intel spec. 27.3.2 "Saving Segment Registers and Descriptor-Table Registers.
+     * See Intel spec. 27.3.2 "Saving Segment Registers and Descriptor-Table Registers".
      */
     if (pSelReg->Attr.u & HMVMX_SEL_UNUSABLE)