Changeset 97923 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/lib/testcase

Timestamp:

Dec 30, 2022 10:24:20 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155013

Message:

Add/VBoxGuestR0LibPhysHeap.cpp: Made VbglR0PhysHeapFree and VbglR0PhysHeapGetPhysAddr more strict wrt input. Cleanups.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/testcase/tstVbglR0PhysHeap-1.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/testcase/tstVbglR0PhysHeap-1.cpp

@@ -87 +87 @@
             g_cChunks++;
             g_cbChunks += cb;
-            *pPhys = (uint32_t)(uintptr_t)pvRet ^ UINT32_C(0xf0f0f000);
+            *pPhys = (uint32_t)(uintptr_t)pvRet ^ (UINT32_C(0xf0f0f0f0) & ~(uint32_t)PAGE_OFFSET_MASK);
+
+            /* Avoid problematic values that won't happen in real life:  */
+            if (!*pPhys)
+                *pPhys = 4U << PAGE_SHIFT;
+            if (UINT32_MAX - *pPhys < cb)
+                *pPhys -= RT_ALIGN_32(cb, PAGE_SIZE);
+
             return pvRet;
         }
@@ -160 +167 @@
     if (RT_FAILURE(rc))
         return RTTestSummaryAndDestroy(hTest);
+
+#define CHECK_PHYS_ADDR(a_pv) do { \
+        uint32_t const uPhys = VbglR0PhysHeapGetPhysAddr(a_pv); \
+        if (uPhys == 0 || uPhys == UINT32_MAX || (uPhys & PAGE_OFFSET_MASK) != ((uintptr_t)(a_pv) & PAGE_OFFSET_MASK)) \
+            RTTestIFailed("line %u: %s=%p: uPhys=%#x\n", __LINE__, #a_pv, (a_pv), uPhys); \
+    } while (0)
 
     /*
@@ -210 +223 @@
         RTTESTI_CHECK_MSG(RT_ALIGN_P(s_aOps[i].pvAlloc, sizeof(void *)) == s_aOps[i].pvAlloc,
                           ("VbglR0PhysHeapAlloc(%#x) -> %p\n", s_aOps[i].cb, i));
-        if (!s_aOps[i].pvAlloc)
-            return RTTestSummaryAndDestroy(hTest);
+
+        CHECK_PHYS_ADDR(s_aOps[i].pvAlloc);
     }
 
@@ -230 +243 @@
         if (!pv)
             return RTTestSummaryAndDestroy(hTest);
+        CHECK_PHYS_ADDR(pv);
+
         //RTPrintf("debug: i=%d pv=%p cbReal=%#zx cbBeforeSub=%#zx cbAfterSubFree=%#zx cbAfterSubAlloc=%#zx \n", i, pv, RTHeapOffsetSize(Heap, pv),
         //         cbBeforeSub, cbAfterSubFree, VbglR0PhysHeapGetFreeSize());
@@ -283 +298 @@
             }
             if (s_aHistory[i].pv)
+            {
                 memset(s_aHistory[i].pv, 0xbb, s_aHistory[i].cb);
+                CHECK_PHYS_ADDR(s_aHistory[i].pv);
+            }
         }
         else
@@ -311 +329 @@
                     s_aHistory[i].pv = VbglR0PhysHeapAlloc(s_aHistory[i].cb);
                     if (s_aHistory[i].pv)
+                    {
                         memset(s_aHistory[i].pv, 0x55, s_aHistory[i].cb);
+                        CHECK_PHYS_ADDR(s_aHistory[i].pv);
+                    }
                 }
 
@@ -327 +348 @@
                         }
                         if (s_aHistory[i].pv)
+                        {
                             memset(s_aHistory[i].pv, 0x55, s_aHistory[i].cb);
+                            CHECK_PHYS_ADDR(s_aHistory[i].pv);
+                        }
 
                         cbFree = VbglR0PhysHeapGetFreeSize();