Changeset 60787 in vbox for trunk

Timestamp:

May 2, 2016 1:07:27 PM (9 years ago)

Author:

vboxsync

Message:

IEM: Check load segment base in 64-bit mode and check that addresses are canonical.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (4 diffs)
• IEMAllCImpl.cpp.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -69 +69 @@
  *      - Level 6 (Log6): Enables/disables the lockstep comparison with REM.
  *      - Level 7 (Log7): iret++ execution logging.
+ *      - Level 8 (Log8): Memory writes.
+ *      - Level 9 (Log9): Memory reads.
  *
  */
@@ -6302 +6304 @@
 
         case IEMMODE_64BIT:
+        {
+            RTGCPTR GCPtrMem = *pGCPtrMem;
             if (iSegReg == X86_SREG_GS || iSegReg == X86_SREG_FS)
-                *pGCPtrMem += pSel->u64Base;
-            return VINF_SUCCESS;
+                *pGCPtrMem = GCPtrMem + pSel->u64Base;
+
+            Assert(cbMem >= 1);
+            if (RT_LIKELY(X86_IS_CANONICAL(GCPtrMem) && X86_IS_CANONICAL(GCPtrMem + cbMem - 1)))
+                return VINF_SUCCESS;
+            return iemRaiseGeneralProtectionFault0(pIemCpu);
+        }
 
         default:
@@ -7061 +7070 @@
         return rcStrict;
 
+    if (fAccess & IEM_ACCESS_TYPE_WRITE)
+        Log8(("IEM WR %RGv (%RGp) LB %#zx\n", GCPtrMem, GCPhysFirst, cbMem));
+    if (fAccess & IEM_ACCESS_TYPE_READ)
+        Log9(("IEM RD %RGv (%RGp) LB %#zx\n", GCPtrMem, GCPhysFirst, cbMem));
+
     void *pvMem;
     rcStrict = iemMemPageMap(pIemCpu, GCPhysFirst, fAccess, &pvMem, &pIemCpu->aMemMappingLocks[iMemMap].Lock);
@@ -10867 +10881 @@
         LogFlow(("IEMExecOne: cs:rip=%04x:%08RX64 ss:rsp=%04x:%08RX64 EFL=%06x\n",
                  pCtx->cs.Sel, pCtx->rip, pCtx->ss.Sel, pCtx->rsp, pCtx->eflags.u));
+
+    uint8_t abTmp[16]; RT_ZERO(abTmp);
+    VBOXSTRICTRC rc2 = PGMPhysRead(pVCpu->CTX_SUFF(pVM), 0x2c370, abTmp, sizeof(abTmp), PGMACCESSORIGIN_IEM);
+    Log(("0x2c370: %.16Rhxs %Rrc\n", &abTmp[0], VBOXSTRICTRC_VAL(rc2)));
 }
 #endif

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

@@ -4024 +4024 @@
     /* The base and limit. */
     uint32_t cbLimit = X86DESC_LIMIT_G(&Desc.Legacy);
-    uint64_t u64Base;
-    if (   pIemCpu->enmCpuMode == IEMMODE_64BIT
-        && iSegReg < X86_SREG_FS)
-        u64Base = 0;
-    else
-        u64Base = X86DESC_BASE(&Desc.Legacy);
+    uint64_t u64Base = X86DESC_BASE(&Desc.Legacy);
 
     /*