[PATCH v2 1/1] ntdll: On macOS, use separate mmap() and mprotect() calls when mapping files with PROT_EXEC.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/ntdll/unix/virtual.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 126bd915e8d..c05659318c6 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -261,6 +261,27 @@ static inline BOOL is_vprot_exec_write( BYTE vprot )
     return (vprot & VPROT_EXEC) && (vprot & (VPROT_WRITE | VPROT_WRITECOPY));
 }

+#ifdef __APPLE__
+static void *mac_mmap( void *addr, size_t len, int prot, int flags, int fd, off_t offset )
+{
+    /* macOS since 10.15 fails to map files with PROT_EXEC
+     * (and will show the user an annoying warning if the file has a quarantine xattr set).
+     * But it works to map without PROT_EXEC and then use mprotect().
+     */
+    if (!(flags & MAP_ANON) && fd >= 0 && prot & PROT_EXEC)
+    {
+        void *ret = mmap( addr, len, prot & ~PROT_EXEC, flags, fd, offset );
+
+        if (ret != MAP_FAILED && mprotect( ret, len, prot ))
+            ERR( "mprotect error %s, range %p-%p, unix_prot %#x\n",
+                 strerror(errno), ret, (char *)ret + len, prot );
+        return ret;
+    }
+    return mmap( addr, len, prot, flags, fd, offset );
+}
+#define mmap(...) mac_mmap(__VA_ARGS__)
+#endif
+
 /* mmap() anonymous memory at a fixed address */
 void *anon_mmap_fixed( void *start, size_t size, int prot, int flags )
 {