Changeset 65413 in vbox for trunk/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp

Timestamp:

Jan 24, 2017 10:26:59 AM (8 years ago)

Author:

vboxsync

Message:

IPRT/r0drv/nt: Preps for using NonPagedPoolNx.

File:

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

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

@@ -36 +36 @@
 #include <iprt/err.h>
 #include "r0drv/alloc-r0drv.h"
+#include "internal-r0drv-nt.h"
 
 
@@ -43 +44 @@
 DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFlags, PRTMEMHDR *ppHdr)
 {
-    if (fFlags & RTMEMHDR_FLAG_ANY_CTX)
-        return VERR_NOT_SUPPORTED;
-
-    PRTMEMHDR pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(NonPagedPool, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
-    if (RT_UNLIKELY(!pHdr))
+    if (!(fFlags & RTMEMHDR_FLAG_ANY_CTX))
+    {
+#if 0 /* This allegedly makes the driver verifier happier... */
+        POOL_TYPE enmPoolType = NonPagedPool;
+        if (!(fFlags & RTMEMHDR_FLAG_EXEC) && g_uRtNtVersion >= RTNT_MAKE_VERSION(8,0))
+            enmPoolType = NonPagedPoolNx;
+        PRTMEMHDR pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(enmPoolType, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
+#else
+        PRTMEMHDR pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(NonPagedPool, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
+#endif
+        if (pHdr)
+        {
+            pHdr->u32Magic  = RTMEMHDR_MAGIC;
+            pHdr->fFlags    = fFlags;
+            pHdr->cb        = (uint32_t)cb; Assert(pHdr->cb == cb);
+            pHdr->cbReq     = (uint32_t)cb;
+            *ppHdr = pHdr;
+            return VINF_SUCCESS;
+        }
         return VERR_NO_MEMORY;
-
-    pHdr->u32Magic  = RTMEMHDR_MAGIC;
-    pHdr->fFlags    = fFlags;
-    pHdr->cb        = (uint32_t)cb; Assert(pHdr->cb == cb);
-    pHdr->cbReq     = (uint32_t)cb;
-    *ppHdr = pHdr;
-    return VINF_SUCCESS;
+    }
+    return VERR_NOT_SUPPORTED;
 }