Changeset 97904 in vbox

Timestamp:

Dec 29, 2022 6:14:03 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/r3/allocex: Implement RTMEMALLOCEX_FLAGS_EXEC using RTMemPageAlloc+RTMemProtect instead of RTMemExecAlloc.

File:

• trunk/src/VBox/Runtime/r3/allocex.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/allocex.cpp

@@ -92 +92 @@
     else if (fFlags & RTMEMALLOCEX_FLAGS_EXEC)
     {
-        pv = RTMemExecAlloc(cbAligned + sizeof(RTMEMHDRR3));
-        if ((fFlags & RTMEMALLOCEX_FLAGS_ZEROED) && pv)
-            RT_BZERO(pv, cbAligned + sizeof(RTMEMHDRR3));
+        pv = RTMemPageAlloc(cbAligned + sizeof(RTMEMHDRR3));
+        if (pv)
+        {
+            if (fFlags & RTMEMALLOCEX_FLAGS_ZEROED)
+                RT_BZERO(pv, cbAligned + sizeof(RTMEMHDRR3));
+
+            int rc = RTMemProtect(pv, cbAligned + sizeof(RTMEMHDRR3), RTMEM_PROT_EXEC | RTMEM_PROT_READ | RTMEM_PROT_WRITE);
+            if (RT_FAILURE(rc))
+            {
+                RTMemPageFree(pv, cbAligned + sizeof(RTMEMHDRR3));
+                return rc;
+            }
+        }
     }
     else if (fFlags & RTMEMALLOCEX_FLAGS_ZEROED)
@@ -132 +142 @@
         rtMemFreeExYyBitReach(pHdr, pHdr->cb + sizeof(*pHdr), pHdr->fFlags);
     else if (pHdr->fFlags & RTMEMALLOCEX_FLAGS_EXEC)
-        RTMemExecFree(pHdr, pHdr->cb + sizeof(*pHdr));
+    {
+        RTMemProtect(pHdr, pHdr->cb + sizeof(*pHdr), RTMEM_PROT_READ | RTMEM_PROT_WRITE);
+        RTMemPageFree(pHdr, pHdr->cb + sizeof(*pHdr));
+    }
     else
         RTMemFree(pHdr);