Changeset 1918 in vbox for trunk/src/VBox

Timestamp:

Apr 4, 2007 10:02:24 AM (18 years ago)

Author:

vboxsync

Message:

Always check if the code selector is wide open. Refuse patching if that's not the case.

File:

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

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -3916 +3916 @@
     uint32_t opsize;
     PPATMPATCHREC pPatchRec;
+    PCPUMCTX pCtx = 0;
     bool disret;
     int rc;
@@ -3948 +3949 @@
         return VERR_PATCHING_REFUSED;
 
-#ifdef VBOX_STRICT
-    PCPUMCTX pCtx = 0;
-
+    /* Make sure the code selector is wide open; otherwise refuse. */
     CPUMQueryGuestCtxPtr(pVM, &pCtx);
-
-    if (    !pCtx->eflags.Bits.u1VM
-        &&  (pCtx->ss & X86_SEL_RPL) == 0)
-    {
-        RTGCPTR pInstrGCFlat = SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, pInstrGC);
-        AssertMsg(pInstrGCFlat == pInstrGC, ("%04x:%VGv != %VGv eflags=%08x\n", pCtx->cs, pInstrGCFlat, pInstrGC, pCtx->eflags.u32));
-    }
-#endif
+    Assert(!pCtx->eflags.Bits.u1VM && (pCtx->ss & X86_SEL_RPL) == 0);
+    RTGCPTR pInstrGCFlat = SELMToFlat(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid, pInstrGC);
+    AssertMsgReturn(pInstrGCFlat == pInstrGC, ("%04x:%VGv != %VGv eflags=%08x\n", pCtx->cs, pInstrGCFlat, pInstrGC, pCtx->eflags.u32), VERR_PATCHING_REFUSED);
 
     /** @note the OpenBSD specific check will break if we allow additional patches to be installed (int 3)) */