Changeset 77172 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Feb 6, 2019 11:38:04 AM (6 years ago)

Author:

vboxsync

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

128656

Message:

IRPT/alloc-r0drv-nt.cpp: Make sure we free early untagged allocations with the untagged free function, otherwise checked kernels will be unhappy with us. ticketref:18187

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• alloc-r0drv.h (modified) (1 diff)
• nt/alloc-r0drv-nt.cpp (modified) (2 diffs)

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

@@ -75 +75 @@
 /** Linux: Allocated by kmalloc() instead of vmalloc(). */
 # define RTMEMHDR_FLAG_KMALLOC      RT_BIT(31)
+#elif defined(RT_OS_WINDOWS)
+/** Windows: Untagged allocation by ExAllocatePool, freed using ExFreePool. */
+# define RTMEMHDR_FLAG_UNTAGGED     RT_BIT(31)
 #endif
 /** @} */

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

@@ -55 +55 @@
         }
         else
+        {
+            fFlags |= RTMEMHDR_FLAG_UNTAGGED;
             pHdr = (PRTMEMHDR)ExAllocatePool(NonPagedPool, cb + sizeof(*pHdr));
+        }
         if (pHdr)
         {
@@ -76 +79 @@
 DECLHIDDEN(void) rtR0MemFree(PRTMEMHDR pHdr)
 {
-    pHdr->u32Magic += 1;
-    if (g_pfnrtExFreePoolWithTag)
+    pHdr->u32Magic = RTMEMHDR_MAGIC_DEAD;
+    if (g_pfnrtExFreePoolWithTag && !(pHdr->fFlags & RTMEMHDR_FLAG_UNTAGGED))
         g_pfnrtExFreePoolWithTag(pHdr, IPRT_NT_POOL_TAG);
     else