Changeset 93200 in vbox for trunk

Timestamp:

Jan 12, 2022 1:51:29 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/alloc-r0drv-nt.cpp: Must apply the NonPagePoolNx selection to both branches in rtR0MemAllocEx. (Yes, g_uRtNtVersion is the first thing that rtR0InitNative sets, so we shouldn't be called before it has a reasonably correct value.) bugref:10162

File:

• trunk/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp (modified) (1 diff)

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

@@ -46 +46 @@
     if (!(fFlags & RTMEMHDR_FLAG_ANY_CTX))
     {
-        PRTMEMHDR pHdr;
+        PRTMEMHDR       pHdr;
+        POOL_TYPE const enmPoolType = !(fFlags & RTMEMHDR_FLAG_EXEC) && g_uRtNtVersion >= RTNT_MAKE_VERSION(8,0)
+                                    ? NonPagedPoolNx : NonPagedPool;
         if (g_pfnrtExAllocatePoolWithTag)
-        {
-            if (!(fFlags & RTMEMHDR_FLAG_EXEC) && g_uRtNtVersion >= RTNT_MAKE_VERSION(8,0))
-                pHdr = (PRTMEMHDR)g_pfnrtExAllocatePoolWithTag(NonPagedPoolNx, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
-            else
-                pHdr = (PRTMEMHDR)g_pfnrtExAllocatePoolWithTag(NonPagedPool, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
-        }
+            pHdr = (PRTMEMHDR)g_pfnrtExAllocatePoolWithTag(enmPoolType, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
         else
         {
             fFlags |= RTMEMHDR_FLAG_UNTAGGED;
-            pHdr = (PRTMEMHDR)ExAllocatePool(NonPagedPool, cb + sizeof(*pHdr));
+            pHdr = (PRTMEMHDR)ExAllocatePool(enmPoolType, cb + sizeof(*pHdr));
         }
         if (pHdr)