Fix broken ReadyToRun loading on Apple Silicon

jgiannuzzi · jgiannuzzi · commit 6e24b2dc1fd2 · 2022-01-19T13:43:47.000+01:00
diff --git a/src/coreclr/pal/src/map/map.cpp b/src/coreclr/pal/src/map/map.cpp
@@ -2047,9 +2047,9 @@ MAPmmapAndRecord(
 
         // Set the requested mapping with forced PROT_WRITE to ensure data from the file can be read there,
         // read the data in and finally remove the forced PROT_WRITE
-        if ((mprotect(pvBaseAddress, len + adjust, prot | PROT_WRITE) == -1) ||
+        if ((mprotect(pvBaseAddress, len + adjust, PROT_WRITE) == -1) ||
             (pread(fd, pvBaseAddress, len + adjust, offset - adjust) == -1) ||
-            (((prot & PROT_WRITE) == 0) && mprotect(pvBaseAddress, len + adjust, prot) == -1))
+            (mprotect(pvBaseAddress, len + adjust, prot) == -1))
         {
             palError = FILEGetLastErrorFromErrno();
         }
diff --git a/src/coreclr/vm/peimagelayout.cpp b/src/coreclr/vm/peimagelayout.cpp
@@ -235,14 +235,14 @@ void PEImageLayout::ApplyBaseRelocations()
             if (((pSection->Characteristics & VAL32(IMAGE_SCN_MEM_WRITE)) == 0))
             {
                 DWORD dwNewProtection = PAGE_READWRITE;
-#if defined(TARGET_UNIX) && !defined(CROSSGEN_COMPILE)
+#if defined(TARGET_UNIX) && !defined(CROSSGEN_COMPILE) && !defined(__APPLE__)
                 if (((pSection->Characteristics & VAL32(IMAGE_SCN_MEM_EXECUTE)) != 0))
                 {
                     // On SELinux, we cannot change protection that doesn't have execute access rights
                     // to one that has it, so we need to set the protection to RWX instead of RW
                     dwNewProtection = PAGE_EXECUTE_READWRITE;
                 }
-#endif // TARGET_UNIX && !CROSSGEN_COMPILE
+#endif // TARGET_UNIX && !CROSSGEN_COMPILE && !__APPLE__
                 if (!ClrVirtualProtect(pWriteableRegion, cbWriteableRegion,
                                        dwNewProtection, &dwOldProtection))
                     ThrowLastError();

Original file line number	Diff line number	Diff line change
`@@ -2047,9 +2047,9 @@ MAPmmapAndRecord(`
`2047`	`2047`
`2048`	`2048`	`// Set the requested mapping with forced PROT_WRITE to ensure data from the file can be read there,`
`2049`	`2049`	`// read the data in and finally remove the forced PROT_WRITE`
`2050`		`- if ((mprotect(pvBaseAddress, len + adjust, prot \| PROT_WRITE) == -1) \|\|`
	`2050`	`+ if ((mprotect(pvBaseAddress, len + adjust, PROT_WRITE) == -1) \|\|`
`2051`	`2051`	`(pread(fd, pvBaseAddress, len + adjust, offset - adjust) == -1) \|\|`
`2052`		`- (((prot & PROT_WRITE) == 0) && mprotect(pvBaseAddress, len + adjust, prot) == -1))`
	`2052`	`+ (mprotect(pvBaseAddress, len + adjust, prot) == -1))`
`2053`	`2053`	`{`
`2054`	`2054`	`palError = FILEGetLastErrorFromErrno();`
`2055`	`2055`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,14 +235,14 @@ void PEImageLayout::ApplyBaseRelocations()`
`235`	`235`	`if (((pSection->Characteristics & VAL32(IMAGE_SCN_MEM_WRITE)) == 0))`
`236`	`236`	`{`
`237`	`237`	`DWORD dwNewProtection = PAGE_READWRITE;`
`238`		`-#if defined(TARGET_UNIX) && !defined(CROSSGEN_COMPILE)`
	`238`	`+#if defined(TARGET_UNIX) && !defined(CROSSGEN_COMPILE) && !defined(__APPLE__)`
`239`	`239`	`if (((pSection->Characteristics & VAL32(IMAGE_SCN_MEM_EXECUTE)) != 0))`
`240`	`240`	`{`
`241`	`241`	`// On SELinux, we cannot change protection that doesn't have execute access rights`
`242`	`242`	`// to one that has it, so we need to set the protection to RWX instead of RW`
`243`	`243`	`dwNewProtection = PAGE_EXECUTE_READWRITE;`
`244`	`244`	`}`
`245`		`-#endif // TARGET_UNIX && !CROSSGEN_COMPILE`
	`245`	`+#endif // TARGET_UNIX && !CROSSGEN_COMPILE && !__APPLE__`
`246`	`246`	`if (!ClrVirtualProtect(pWriteableRegion, cbWriteableRegion,`
`247`	`247`	`dwNewProtection, &dwOldProtection))`
`248`	`248`	`ThrowLastError();`