Changeset 7244 in vbox

Timestamp:

Mar 3, 2008 4:21:39 PM (17 years ago)

Author:

vboxsync

Message:

Fixed corruption in RTMemExecAlloc when fencing was enabled (RT_STRICT/RTR0MEM_STRICT).

File:

• trunk/src/VBox/Runtime/r0drv/alloc-r0drv.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r0drv/alloc-r0drv.cpp

@@ -122 +122 @@
 #ifdef RTR0MEM_STRICT
         pHdr->cbReq = cb;
-        memcpy((uint8_t *)(pHdr + 1) + cb, &g_abFence[0], sizeof(g_abFence));
+        memcpy((uint8_t *)(pHdr + 1) + cb, &g_abFence[0], RTR0MEM_FENCE_EXTRA);
 #endif
         return pHdr + 1;
@@ -148 +148 @@
 #ifdef RTR0MEM_STRICT
         pHdr->cbReq = cb;
-        memcpy((uint8_t *)(pHdr + 1) + cb, &g_abFence[0], sizeof(g_abFence));
+        memcpy((uint8_t *)(pHdr + 1) + cb, &g_abFence[0], RTR0MEM_FENCE_EXTRA);
         return memset(pHdr + 1, 0, cb);
 #else
@@ -187 +187 @@
 #ifdef RTR0MEM_STRICT
                 pHdrNew->cbReq = cbNew;
-                memcpy((uint8_t *)(pHdrNew + 1) + cbNew, &g_abFence[0], sizeof(g_abFence));
-                AssertReleaseMsg(!memcmp((uint8_t *)(pHdrOld + 1) + pHdrOld->cbReq, &g_abFence[0], sizeof(g_abFence)),
+                memcpy((uint8_t *)(pHdrNew + 1) + cbNew, &g_abFence[0], RTR0MEM_FENCE_EXTRA);
+                AssertReleaseMsg(!memcmp((uint8_t *)(pHdrOld + 1) + pHdrOld->cbReq, &g_abFence[0], RTR0MEM_FENCE_EXTRA),
                                  ("pHdr=%p pvOld=%p cb=%zu cbNew=%zu\n"
                                   "fence:    %.*Rhxs\n"
                                   "expected: %.*Rhxs\n",
                                   pHdrOld, pvOld, pHdrOld->cb, cbNew,
-                                  sizeof(g_abFence), (uint8_t *)(pHdrOld + 1) + pHdrOld->cb,
-                                  sizeof(g_abFence), &g_abFence[0]));
+                                  RTR0MEM_FENCE_EXTRA, (uint8_t *)(pHdrOld + 1) + pHdrOld->cb,
+                                  RTR0MEM_FENCE_EXTRA, &g_abFence[0]));
 #endif
                 rtMemFree(pHdrOld);
@@ -223 +223 @@
         Assert(!(pHdr->fFlags & RTMEMHDR_FLAG_EXEC));
 #ifdef RTR0MEM_STRICT
-        AssertReleaseMsg(!memcmp((uint8_t *)(pHdr + 1) + pHdr->cbReq, &g_abFence[0], sizeof(g_abFence)),
+        AssertReleaseMsg(!memcmp((uint8_t *)(pHdr + 1) + pHdr->cbReq, &g_abFence[0], RTR0MEM_FENCE_EXTRA),
                          ("pHdr=%p pv=%p cb=%zu\n"
                           "fence:    %.*Rhxs\n"
                           "expected: %.*Rhxs\n",
                           pHdr, pv, pHdr->cb, pv,
-                          sizeof(g_abFence), (uint8_t *)(pHdr + 1) + pHdr->cb,
-                          sizeof(g_abFence), &g_abFence[0]));
+                          RTR0MEM_FENCE_EXTRA, (uint8_t *)(pHdr + 1) + pHdr->cb,
+                          RTR0MEM_FENCE_EXTRA, &g_abFence[0]));
 #endif
         rtMemFree(pHdr);
@@ -247 +247 @@
 RTDECL(void *)    RTMemExecAlloc(size_t cb)
 {
-    PRTMEMHDR pHdr = rtMemAlloc(cb, RTMEMHDR_FLAG_EXEC);
+    PRTMEMHDR pHdr = rtMemAlloc(cb + RTR0MEM_FENCE_EXTRA, RTMEMHDR_FLAG_EXEC);
     if (pHdr)
     {
 #ifdef RTR0MEM_STRICT
-        memcpy((uint8_t *)(pHdr + 1) + cb, &g_abFence[0], sizeof(g_abFence));
+        memcpy((uint8_t *)(pHdr + 1) + cb, &g_abFence[0], RTR0MEM_FENCE_EXTRA);
 #endif
         return pHdr + 1;
@@ -273 +273 @@
     {
 #ifdef RTR0MEM_STRICT
-        AssertReleaseMsg(!memcmp((uint8_t *)(pHdr + 1) + pHdr->cbReq, &g_abFence[0], sizeof(g_abFence)),
+        AssertReleaseMsg(!memcmp((uint8_t *)(pHdr + 1) + pHdr->cbReq, &g_abFence[0], RTR0MEM_FENCE_EXTRA),
                          ("pHdr=%p pv=%p cb=%zu\n"
                           "fence:    %.*Rhxs\n"
                           "expected: %.*Rhxs\n",
                           pHdr, pv, pHdr->cb,
-                          sizeof(g_abFence), (uint8_t *)(pHdr + 1) + pHdr->cb,
-                          sizeof(g_abFence), &g_abFence[0]));
+                          RTR0MEM_FENCE_EXTRA, (uint8_t *)(pHdr + 1) + pHdr->cb,
+                          RTR0MEM_FENCE_EXTRA, &g_abFence[0]));
 #endif
         rtMemFree(pHdr);