Changeset 97910 in vbox for trunk/src/VBox/Runtime/r0drv/nt

Timestamp:

Dec 29, 2022 7:15:56 PM (2 years ago)

Author:

vboxsync

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

155000

Message:

IPRT/r0drv: Kicked out RTMEMHDR_FLAG_EXEC and associated code now that RTMemExecAlloc have been removed and RTMEMALLOCEX_FLAGS_EXEC is ring-3 only. This should simplify maintaining the linux code a bit, I hope. bugref:4567:65

File:

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

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

@@ -57 +57 @@
     {
         PRTMEMHDR       pHdr;
-        POOL_TYPE const enmPoolType = !(fFlags & RTMEMHDR_FLAG_EXEC) && g_uRtNtVersion >= RTNT_MAKE_VERSION(8,0)
-                                    ? NonPagedPoolNx : NonPagedPool;
+        POOL_TYPE const enmPoolType = g_uRtNtVersion >= RTNT_MAKE_VERSION(8,0) ? NonPagedPoolNx : NonPagedPool;
         if (g_pfnrtExAllocatePoolWithTag)
             pHdr = (PRTMEMHDR)g_pfnrtExAllocatePoolWithTag(enmPoolType, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
@@ -66 +65 @@
             pHdr = (PRTMEMHDR)ExAllocatePool(enmPoolType, cb + sizeof(*pHdr));
         }
-        if (pHdr)
+        if (RT_LIKELY(pHdr))
         {
             pHdr->u32Magic  = RTMEMHDR_MAGIC;