Fix reserving executable memory as per allocation type in ClrVirtualAllocWithinRange()

k15tfu · k15tfu · commit 475b7ade245b · 2023-03-24T09:13:22.000+01:00
Fixes #83818
diff --git a/src/coreclr/utilcode/util.cpp b/src/coreclr/utilcode/util.cpp
@@ -369,7 +369,7 @@ BYTE * ClrVirtualAllocWithinRange(const BYTE *pMinAddr,
     {
         NOTHROW;
         PRECONDITION(dwSize != 0);
-        PRECONDITION(flAllocationType == MEM_RESERVE);
+        PRECONDITION(flAllocationType == MEM_RESERVE);  // ORed with MEM_RESERVE_EXECUTABLE on Unix
     }
     CONTRACTL_END;
 
@@ -449,7 +449,7 @@ BYTE * ClrVirtualAllocWithinRange(const BYTE *pMinAddr,
             (mbInfo.RegionSize >= (SIZE_T) dwSize || mbInfo.RegionSize == 0))
         {
             // Try reserving the memory using VirtualAlloc now
-            pResult = (BYTE*)ClrVirtualAlloc(tryAddr, dwSize, MEM_RESERVE, flProtect);
+            pResult = (BYTE*)ClrVirtualAlloc(tryAddr, dwSize, flAllocationType, flProtect);
 
             // Normally this will be successful
             //

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ BYTE * ClrVirtualAllocWithinRange(const BYTE *pMinAddr,`
`369`	`369`	`{`
`370`	`370`	`NOTHROW;`
`371`	`371`	`PRECONDITION(dwSize != 0);`
`372`		`- PRECONDITION(flAllocationType == MEM_RESERVE);`
	`372`	`+ PRECONDITION(flAllocationType == MEM_RESERVE); // ORed with MEM_RESERVE_EXECUTABLE on Unix`
`373`	`373`	`}`
`374`	`374`	`CONTRACTL_END;`
`375`	`375`
`@@ -449,7 +449,7 @@ BYTE * ClrVirtualAllocWithinRange(const BYTE *pMinAddr,`
`449`	`449`	`(mbInfo.RegionSize >= (SIZE_T) dwSize \|\| mbInfo.RegionSize == 0))`
`450`	`450`	`{`
`451`	`451`	`// Try reserving the memory using VirtualAlloc now`
`452`		`- pResult = (BYTE*)ClrVirtualAlloc(tryAddr, dwSize, MEM_RESERVE, flProtect);`
	`452`	`+ pResult = (BYTE*)ClrVirtualAlloc(tryAddr, dwSize, flAllocationType, flProtect);`
`453`	`453`
`454`	`454`	`// Normally this will be successful`
`455`	`455`	`//`