Index: compiler-rt/lib/dfsan/dfsan_interceptors.cpp =================================================================== --- compiler-rt/lib/dfsan/dfsan_interceptors.cpp +++ compiler-rt/lib/dfsan/dfsan_interceptors.cpp @@ -157,7 +157,7 @@ INTERCEPTOR(void *, mmap, void *addr, SIZE_T length, int prot, int flags, int fd, OFF_T offset) { if (common_flags()->detect_write_exec) - ReportMmapWriteExec(prot); + ReportMmapWriteExec(prot, flags); if (!__dfsan::dfsan_inited) return (void *)internal_mmap(addr, length, prot, flags, fd, offset); COMMON_INTERCEPTOR_ENTER(mmap, addr, length, prot, flags, fd, offset); @@ -171,7 +171,7 @@ INTERCEPTOR(void *, mmap64, void *addr, SIZE_T length, int prot, int flags, int fd, OFF64_T offset) { if (common_flags()->detect_write_exec) - ReportMmapWriteExec(prot); + ReportMmapWriteExec(prot, flags); if (!__dfsan::dfsan_inited) return (void *)internal_mmap(addr, length, prot, flags, fd, offset); COMMON_INTERCEPTOR_ENTER(mmap64, addr, length, prot, flags, fd, offset); Index: compiler-rt/lib/sanitizer_common/sanitizer_common.h =================================================================== --- compiler-rt/lib/sanitizer_common/sanitizer_common.h +++ compiler-rt/lib/sanitizer_common/sanitizer_common.h @@ -371,7 +371,7 @@ void ReportErrorSummary(const char *error_type, const StackTrace *trace, const char *alt_tool_name = nullptr); -void ReportMmapWriteExec(int prot); +void ReportMmapWriteExec(int prot, int mflags); // Math #if SANITIZER_WINDOWS && !defined(__clang__) && !defined(__GNUC__) Index: compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc =================================================================== --- compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -7418,7 +7418,7 @@ OFF_T off) { void *ctx; if (common_flags()->detect_write_exec) - ReportMmapWriteExec(prot); + ReportMmapWriteExec(prot, flags); if (COMMON_INTERCEPTOR_NOTHING_IS_INITIALIZED) return (void *)internal_mmap(addr, sz, prot, flags, fd, off); COMMON_INTERCEPTOR_ENTER(ctx, mmap, addr, sz, prot, flags, fd, off); @@ -7428,7 +7428,7 @@ INTERCEPTOR(int, mprotect, void *addr, SIZE_T sz, int prot) { void *ctx; if (common_flags()->detect_write_exec) - ReportMmapWriteExec(prot); + ReportMmapWriteExec(prot, 0); if (COMMON_INTERCEPTOR_NOTHING_IS_INITIALIZED) return (int)internal_mprotect(addr, sz, prot); COMMON_INTERCEPTOR_ENTER(ctx, mprotect, addr, sz, prot); @@ -7447,7 +7447,7 @@ OFF64_T off) { void *ctx; if (common_flags()->detect_write_exec) - ReportMmapWriteExec(prot); + ReportMmapWriteExec(prot, flags); if (COMMON_INTERCEPTOR_NOTHING_IS_INITIALIZED) return (void *)internal_mmap(addr, sz, prot, flags, fd, off); COMMON_INTERCEPTOR_ENTER(ctx, mmap64, addr, sz, prot, flags, fd, off); Index: compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report.cpp =================================================================== --- compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report.cpp +++ compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_report.cpp @@ -88,11 +88,19 @@ #endif } -void ReportMmapWriteExec(int prot) { +void ReportMmapWriteExec(int prot, int flags) { #if SANITIZER_POSIX && (!SANITIZER_GO && !SANITIZER_ANDROID) - if ((prot & (PROT_WRITE | PROT_EXEC)) != (PROT_WRITE | PROT_EXEC)) + int pflags = (PROT_WRITE | PROT_EXEC); + if ((prot & pflags) != pflags) return; +# if SANITIZER_MAC || SANITIZER_IOS +# if defined(MAP_JIT) + if ((flags & MAP_JIT) == MAP_JIT) + return; +# endif +# endif + ScopedErrorReportLock l; SanitizerCommonDecorator d; Index: compiler-rt/lib/tsan/rtl/tsan_platform_mac.cpp =================================================================== --- compiler-rt/lib/tsan/rtl/tsan_platform_mac.cpp +++ compiler-rt/lib/tsan/rtl/tsan_platform_mac.cpp @@ -240,7 +240,7 @@ uptr max_vm = GetMaxUserVirtualAddress() + 1; if (max_vm != HiAppMemEnd()) { Printf("ThreadSanitizer: unsupported vm address limit %p, expected %p.\n", - max_vm, HiAppMemEnd()); + (void *)max_vm, (void *)HiAppMemEnd()); Die(); } #endif Index: compiler-rt/test/sanitizer_common/TestCases/Posix/mmap_write_exec.cpp =================================================================== --- compiler-rt/test/sanitizer_common/TestCases/Posix/mmap_write_exec.cpp +++ compiler-rt/test/sanitizer_common/TestCases/Posix/mmap_write_exec.cpp @@ -7,6 +7,7 @@ // TODO: Fix option on Android, it hangs there for unknown reasons. // XFAIL: android +#include #include #include @@ -30,6 +31,12 @@ MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0); (void)mprotect(q, 64, PROT_READ | PROT_EXEC); // CHECK-NOT: Sanitizer +#if defined(__APPLE__) + pthread_jit_write_protect_np(false); + char *c = (char *)mmap(0, 128, PROT_WRITE | PROT_EXEC, + MAP_ANONYMOUS | MAP_PRIVATE | MAP_JIT, -1, 0); + // CHECK-NOT: Sanitizer +#endif printf("done\n"); // CHECK-DISABLED-NOT: Sanitizer