Changeset 102855 in vbox for trunk

Timestamp:

Jan 12, 2024 10:51:18 AM (13 months ago)

Author:

vboxsync

Message:

Debugger: Don't allow plain PAGE_SIZE etc.

Location:

trunk/src/VBox/Debugger

Files:

• .scm-settings (modified) (1 diff)
• DBGCCmdHlp.cpp (modified) (2 diffs)
• DBGCEmulateCodeView.cpp (modified) (12 diffs)
• DBGPlugInDarwin.cpp (modified) (9 diffs)
• DBGPlugInWinNt.cpp (modified) (4 diffs)

trunk/src/VBox/Debugger/.scm-settings

@@ -28 +28 @@
 /*.h: --guard-relative-to-dir . --guard-prefix DEBUGGER_INCLUDED_SRC_
 
+# Forbid PAGE_SIZE, PAGE_SIZE and PAGE_OFFSET_MASK w/o GUEST_ or HOST_ prefix.
+/*.cpp: --only-guest-host-page
+/*.h:   --only-guest-host-page
+
+# Forbid ASMMemIsZeroPage and ASMMemZeroPage.
+/*.cpp: --no-ASMMemPage-use
+/*.h:   --no-ASMMemPage-use

trunk/src/VBox/Debugger/DBGCCmdHlp.cpp

@@ -414 +414 @@
          * Calc read size.
          */
-        size_t cb = RT_MIN(PAGE_SIZE, cbLeft);
+        size_t cb = RT_MIN(GUEST_PAGE_SIZE, cbLeft);
         switch (pVarPointer->enmType)
         {
-            case DBGCVAR_TYPE_GC_FLAT: cb = RT_MIN(cb, PAGE_SIZE - (Var.u.GCFlat & PAGE_OFFSET_MASK)); break;
-            case DBGCVAR_TYPE_GC_PHYS: cb = RT_MIN(cb, PAGE_SIZE - (Var.u.GCPhys & PAGE_OFFSET_MASK)); break;
-            case DBGCVAR_TYPE_HC_FLAT: cb = RT_MIN(cb, PAGE_SIZE - ((uintptr_t)Var.u.pvHCFlat & PAGE_OFFSET_MASK)); break;
-            case DBGCVAR_TYPE_HC_PHYS: cb = RT_MIN(cb, PAGE_SIZE - ((size_t)Var.u.HCPhys & PAGE_OFFSET_MASK)); break; /* size_t: MSC has braindead loss of data warnings! */
+            case DBGCVAR_TYPE_GC_FLAT: cb = RT_MIN(cb, GUEST_PAGE_SIZE - (Var.u.GCFlat & GUEST_PAGE_OFFSET_MASK)); break;
+            case DBGCVAR_TYPE_GC_PHYS: cb = RT_MIN(cb, GUEST_PAGE_SIZE - (Var.u.GCPhys & GUEST_PAGE_OFFSET_MASK)); break;
+            case DBGCVAR_TYPE_HC_FLAT: cb = RT_MIN(cb, GUEST_PAGE_SIZE - ((uintptr_t)Var.u.pvHCFlat & GUEST_PAGE_OFFSET_MASK)); break;
+            case DBGCVAR_TYPE_HC_PHYS: cb = RT_MIN(cb, GUEST_PAGE_SIZE - ((size_t)Var.u.HCPhys & GUEST_PAGE_OFFSET_MASK)); break; /* size_t: MSC has braindead loss of data warnings! */
             default: break;
         }
@@ -604 +604 @@
 
                 /* calc size. */
-                size_t cbChunk = PAGE_SIZE;
-                cbChunk -= (uintptr_t)Var.u.pvHCFlat & PAGE_OFFSET_MASK;
+                size_t cbChunk = GUEST_PAGE_SIZE;
+                cbChunk -= (uintptr_t)Var.u.pvHCFlat & GUEST_PAGE_OFFSET_MASK;
                 if (cbChunk > cbWrite)
                     cbChunk = cbWrite;

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -3212 +3212 @@
         uint32_t cbLimit = pDesc->Gen.u16LimitLow | (pDesc->Gen.u4LimitHigh << 16);
         if (pDesc->Gen.u1Granularity)
-            cbLimit <<= PAGE_SHIFT;
+            cbLimit <<= GUEST_PAGE_SHIFT;
 
         rc = DBGCCmdHlpPrintf(pCmdHlp, "%04x %s Bas=%08x Lim=%08x DPL=%d %s %s %s %s AVL=%d L=%d%s\n",
@@ -3266 +3266 @@
                 uint32_t cbLimit = pDesc->Gen.u16LimitLow | (pDesc->Gen.u4LimitHigh << 16);
                 if (pDesc->Gen.u1Granularity)
-                    cbLimit <<= PAGE_SHIFT;
+                    cbLimit <<= GUEST_PAGE_SHIFT;
 
                 rc = DBGCCmdHlpPrintf(pCmdHlp, "%04x %s Bas=%08x Lim=%08x DPL=%d %s %s %s %s AVL=%d R=%d%s\n",
@@ -3976 +3976 @@
         if (fPAE)
             return DBGCCmdHlpPrintf(pCmdHlp, "PDE indexing is only implemented for 32-bit paging.\n");
-        if (VarDefault.u.u64Number >= PAGE_SIZE / cbEntry)
-            return DBGCCmdHlpPrintf(pCmdHlp, "PDE index is out of range [0..%d].\n", PAGE_SIZE / cbEntry - 1);
+        if (VarDefault.u.u64Number >= GUEST_PAGE_SIZE / cbEntry)
+            return DBGCCmdHlpPrintf(pCmdHlp, "PDE index is out of range [0..%d].\n", GUEST_PAGE_SIZE / cbEntry - 1);
         VarDefault.u.u64Number <<= X86_PD_SHIFT;
         VarDefault.enmType = DBGCVAR_TYPE_GC_FLAT;
@@ -4006 +4006 @@
             default:                        cEntries = 10; break;
         }
-        cEntriesMax = PAGE_SIZE / cbEntry;
+        cEntriesMax = GUEST_PAGE_SIZE / cbEntry;
     }
     else
@@ -4015 +4015 @@
         switch (paArgs[0].enmRangeType)
         {
-            case DBGCVAR_RANGE_BYTES:       cEntries = paArgs[0].u64Range / PAGE_SIZE; break;
+            case DBGCVAR_RANGE_BYTES:       cEntries = paArgs[0].u64Range / GUEST_PAGE_SIZE; break;
             case DBGCVAR_RANGE_ELEMENTS:    cEntries = paArgs[0].u64Range; break;
             default:                        cEntries = 10; break;
@@ -4083 +4083 @@
             VarPDEAddr.u.u64Number += iEntry * sizeof(X86PDE);
         }
-        cEntriesMax = (PAGE_SIZE - iEntry) / cbEntry;
+        cEntriesMax = (GUEST_PAGE_SIZE - iEntry) / cbEntry;
     }
 
@@ -4220 +4220 @@
 
     uint64_t cbRange;
-    rc = DBGCCmdHlpVarGetRange(pCmdHlp, pRange, PAGE_SIZE, PAGE_SIZE * 8, &cbRange);
+    rc = DBGCCmdHlpVarGetRange(pCmdHlp, pRange, GUEST_PAGE_SIZE, GUEST_PAGE_SIZE * 8, &cbRange);
     if (RT_FAILURE(rc))
         return DBGCCmdHlpFail(pCmdHlp, pCmd, "Failed to obtain the range of %DV: %Rrc", pRange, rc);
@@ -4353 +4353 @@
             default:                        cEntries = 10; break;
         }
-        cEntriesMax = PAGE_SIZE / cbEntry;
+        cEntriesMax = GUEST_PAGE_SIZE / cbEntry;
     }
     else
@@ -4362 +4362 @@
         switch (paArgs[0].enmRangeType)
         {
-            case DBGCVAR_RANGE_BYTES:       cEntries = paArgs[0].u64Range / PAGE_SIZE; break;
+            case DBGCVAR_RANGE_BYTES:       cEntries = paArgs[0].u64Range / GUEST_PAGE_SIZE; break;
             case DBGCVAR_RANGE_ELEMENTS:    cEntries = paArgs[0].u64Range; break;
             default:                        cEntries = 10; break;
@@ -4378 +4378 @@
             VarGCPtr.enmType = DBGCVAR_TYPE_GC_FLAT;
         }
-        VarGCPtr.u.GCFlat &= ~(RTGCPTR)PAGE_OFFSET_MASK;
+        VarGCPtr.u.GCFlat &= ~(RTGCPTR)GUEST_PAGE_OFFSET_MASK;
 
         /*
@@ -4451 +4451 @@
             VarPTEAddr.u.u64Number += iEntry * sizeof(X86PTE);
         }
-        cEntriesMax = (PAGE_SIZE - iEntry) / cbEntry;
+        cEntriesMax = (GUEST_PAGE_SIZE - iEntry) / cbEntry;
     }
 
@@ -4511 +4511 @@
         VarPTEAddr.u.u64Number += cbEntry;
         if (iEntry != ~0U)
-            VarGCPtr.u.GCFlat += PAGE_SIZE;
+            VarGCPtr.u.GCFlat += GUEST_PAGE_SIZE;
     } while (cEntries-- > 0);
 

trunk/src/VBox/Debugger/DBGPlugInDarwin.cpp

@@ -458 +458 @@
      * Check that all the pages are present.
      */
-    cbSeg    += uSegAddr & X86_PAGE_OFFSET_MASK;
-    uSegAddr &= ~(uint64_t)X86_PAGE_OFFSET_MASK;
+    cbSeg    += uSegAddr & GUEST_PAGE_OFFSET_MASK;
+    uSegAddr &= ~(uint64_t)GUEST_PAGE_OFFSET_MASK;
     for (;;)
     {
@@ -473 +473 @@
 
         /* Advance */
-        if (cbSeg <= X86_PAGE_SIZE)
+        if (cbSeg <= GUEST_PAGE_SIZE)
             return true;
-        cbSeg    -= X86_PAGE_SIZE;
-        uSegAddr += X86_PAGE_SIZE;
+        cbSeg    -= GUEST_PAGE_SIZE;
+        uSegAddr += GUEST_PAGE_SIZE;
     }
 }
@@ -522 +522 @@
     union
     {
-        uint8_t             ab[2 * X86_PAGE_4K_SIZE];
+        uint8_t             ab[2 * GUEST_PAGE_SIZE];
         mach_header_64_t    Hdr64;
         mach_header_32_t    Hdr32;
@@ -530 +530 @@
     DBGFADDRESS ModAddr;
     int rc = pVMM->pfnDBGFR3MemRead(pUVM, 0 /*idCpu*/,
-                                    pVMM->pfnDBGFR3AddrFromFlat(pUVM, &ModAddr, uModAddr), uBuf.ab, X86_PAGE_4K_SIZE);
+                                    pVMM->pfnDBGFR3AddrFromFlat(pUVM, &ModAddr, uModAddr), uBuf.ab, GUEST_PAGE_SIZE);
     if (RT_FAILURE(rc))
         return rc;
@@ -551 +551 @@
         return VERR_BAD_EXE_FORMAT;
     AssertCompileMembersSameSizeAndOffset(mach_header_64_t, sizeofcmds, mach_header_32_t, sizeofcmds);
-    if (uBuf.Hdr32.sizeofcmds > X86_PAGE_4K_SIZE * 2 - sizeof(mach_header_64_t))
+    if (uBuf.Hdr32.sizeofcmds > GUEST_PAGE_SIZE * 2 - sizeof(mach_header_64_t))
         return VERR_BAD_EXE_FORMAT;
 
     /* Do we need to read a 2nd page to get all the load commands? If so, do it. */
-    if (uBuf.Hdr32.sizeofcmds + (f64Bit ? sizeof(mach_header_64_t) : sizeof(mach_header_32_t)) > X86_PAGE_4K_SIZE)
-    {
-        rc = pVMM->pfnDBGFR3MemRead(pUVM, 0 /*idCpu*/, pVMM->pfnDBGFR3AddrFromFlat(pUVM, &ModAddr, uModAddr + X86_PAGE_4K_SIZE),
-                                    &uBuf.ab[X86_PAGE_4K_SIZE], X86_PAGE_4K_SIZE);
+    if (uBuf.Hdr32.sizeofcmds + (f64Bit ? sizeof(mach_header_64_t) : sizeof(mach_header_32_t)) > GUEST_PAGE_SIZE)
+    {
+        rc = pVMM->pfnDBGFR3MemRead(pUVM, 0 /*idCpu*/, pVMM->pfnDBGFR3AddrFromFlat(pUVM, &ModAddr, uModAddr + GUEST_PAGE_SIZE),
+                                    &uBuf.ab[GUEST_PAGE_SIZE], GUEST_PAGE_SIZE);
         if (RT_FAILURE(rc))
             return rc;
@@ -1011 +1011 @@
         for (pVMM->pfnDBGFR3AddrFromFlat(pUVM, &KernelAddr, s_aRanges[iRange].uStart);
              KernelAddr.FlatPtr < s_aRanges[iRange].uEnd;
-             KernelAddr.FlatPtr += X86_PAGE_4K_SIZE)
+             KernelAddr.FlatPtr += GUEST_PAGE_SIZE)
         {
             static const uint8_t s_abNeedle[16 + 16] =
@@ -1023 +1023 @@
             if (RT_FAILURE(rc))
                 break;
-            pVMM->pfnDBGFR3AddrSub(&KernelAddr, KernelAddr.FlatPtr & X86_PAGE_4K_OFFSET_MASK);
+            pVMM->pfnDBGFR3AddrSub(&KernelAddr, KernelAddr.FlatPtr & GUEST_PAGE_OFFSET_MASK);
 
             /*
@@ -1030 +1030 @@
             union
             {
-                uint8_t             ab[X86_PAGE_4K_SIZE];
+                uint8_t             ab[GUEST_PAGE_SIZE];
                 mach_header_64_t    Hdr64;
                 mach_header_32_t    Hdr32;
             } uBuf;
-            rc = pVMM->pfnDBGFR3MemRead(pUVM, 0 /*idCpu*/, &KernelAddr, uBuf.ab, X86_PAGE_4K_SIZE);
+            rc = pVMM->pfnDBGFR3MemRead(pUVM, 0 /*idCpu*/, &KernelAddr, uBuf.ab, GUEST_PAGE_SIZE);
             if (RT_FAILURE(rc))
                 continue;
@@ -1052 +1052 @@
                 continue;
             AssertCompileMembersSameSizeAndOffset(mach_header_64_t, sizeofcmds, mach_header_32_t, sizeofcmds);
-            if (uBuf.Hdr32.sizeofcmds > X86_PAGE_4K_SIZE * 2 - sizeof(mach_header_64_t))
+            if (uBuf.Hdr32.sizeofcmds > GUEST_PAGE_SIZE * 2 - sizeof(mach_header_64_t))
                 continue;
 

trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp

@@ -1293 +1293 @@
     union
     {
-        uint8_t             au8[0x2000];
-        RTUTF16             wsz[0x2000/2];
+        uint8_t             au8[GUEST_PAGE_SIZE * 2];
+        RTUTF16             wsz[GUEST_PAGE_SIZE];
         NTKUSERSHAREDDATA   UserSharedData;
     }               u;
@@ -1304 +1304 @@
      */
     pVMM->pfnDBGFR3AddrFromFlat(pUVM, &Addr, pThis->f32Bit ? NTKUSERSHAREDDATA_WINNT32 : NTKUSERSHAREDDATA_WINNT64);
-    rc = pVMM->pfnDBGFR3MemRead(pUVM, 0 /*idCpu*/, &Addr, &u, PAGE_SIZE);
+    rc = pVMM->pfnDBGFR3MemRead(pUVM, 0 /*idCpu*/, &Addr, &u, GUEST_PAGE_SIZE);
     if (RT_SUCCESS(rc))
     {
@@ -1515 +1515 @@
     for (pVMM->pfnDBGFR3AddrFromFlat(pUVM, &KernelAddr, uKrnlStart);
          KernelAddr.FlatPtr < uKrnlEnd;
-         KernelAddr.FlatPtr += PAGE_SIZE)
+         KernelAddr.FlatPtr += GUEST_PAGE_SIZE)
     {
         bool fNt31 = false;
@@ -1532 +1532 @@
         if (RT_FAILURE(rc))
             break;
-        pVMM->pfnDBGFR3AddrSub(&KernelAddr, KernelAddr.FlatPtr & PAGE_OFFSET_MASK);
+        pVMM->pfnDBGFR3AddrSub(&KernelAddr, KernelAddr.FlatPtr & GUEST_PAGE_OFFSET_MASK);
 
         /* MZ + PE header. */