Revert "Mmap interceptor providing mprotect support"

Breaks Darwin.

This reverts commit r328369.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@328375 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 8 insertions, 46 deletions

diff --git a/lib/sanitizer_common/sanitizer_common.h b/lib/sanitizer_common/sanitizer_common.h
index 326c56ec4..c1f49852e 100644
--- a/lib/sanitizer_common/sanitizer_common.h
+++ b/lib/sanitizer_common/sanitizer_common.h
@@ -378,7 +378,7 @@ void ReportErrorSummary(const char *error_type, const AddressInfo &info,
 void ReportErrorSummary(const char *error_type, const StackTrace *trace,
                         const char *alt_tool_name = nullptr);
 
-void ReportMmapWriteExec(int prot);
+void ReportMmapWriteExec();
 
 // Math
 #if SANITIZER_WINDOWS && !defined(__clang__) && !defined(__GNUC__)
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc
index 8ea8b3e0e..8c0c3f0f5 100644
--- a/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -6888,25 +6888,13 @@ INTERCEPTOR(void *, mmap, void *addr, SIZE_T sz, int prot, int flags, int fd,
             OFF_T off) {
   void *ctx;
   if (common_flags()->detect_write_exec)
-    ReportMmapWriteExec(prot);
+    ReportMmapWriteExec();
   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);
   COMMON_INTERCEPTOR_MMAP_IMPL(ctx, mmap, addr, sz, prot, flags, fd, off);
 }
-
-INTERCEPTOR(int, mprotect, void *addr, SIZE_T sz, int prot) {
-  void *ctx;
-  if (common_flags()->detect_write_exec)
-    ReportMmapWriteExec(prot);
-  if (COMMON_INTERCEPTOR_NOTHING_IS_INITIALIZED)
-    return (int)internal_mprotect(addr, sz, prot);
-  COMMON_INTERCEPTOR_ENTER(ctx, mprotect, addr, sz, prot);
-  return REAL(mprotect)(addr, sz, prot);
-}
-#define INIT_MMAP \
-  COMMON_INTERCEPT_FUNCTION(mmap); \
-  COMMON_INTERCEPT_FUNCTION(mprotect);
+#define INIT_MMAP COMMON_INTERCEPT_FUNCTION(mmap);
 #else
 #define INIT_MMAP
 #endif
@@ -6916,7 +6904,7 @@ INTERCEPTOR(void *, mmap64, void *addr, SIZE_T sz, int prot, int flags, int fd,
             OFF64_T off) {
   void *ctx;
   if (common_flags()->detect_write_exec)
-    ReportMmapWriteExec(prot);
+    ReportMmapWriteExec();
   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);
diff --git a/lib/sanitizer_common/sanitizer_common_libcdep.cc b/lib/sanitizer_common/sanitizer_common_libcdep.cc
index 224f6b19c..7f07bcfd0 100644
--- a/lib/sanitizer_common/sanitizer_common_libcdep.cc
+++ b/lib/sanitizer_common/sanitizer_common_libcdep.cc
@@ -24,7 +24,6 @@
 
 #if SANITIZER_POSIX
 #include "sanitizer_posix.h"
-#include <sys/mman.h>
 #endif
 
 namespace __sanitizer {
@@ -82,11 +81,8 @@ void ReportErrorSummary(const char *error_type, const StackTrace *stack,
 #endif
 }
 
-void ReportMmapWriteExec(int prot) {
-#if SANITIZER_POSIX && (!SANITIZER_GO && !SANITIZER_ANDROID)
-  if ((prot & (PROT_WRITE | PROT_EXEC)) != (PROT_WRITE | PROT_EXEC))
-    return;
-
+void ReportMmapWriteExec() {
+#if !SANITIZER_GO && !SANITIZER_ANDROID
   ScopedErrorReportLock l;
   SanitizerCommonDecorator d;
 
diff --git a/test/sanitizer_common/TestCases/Linux/mmap_write_exec.cpp b/test/sanitizer_common/TestCases/Linux/mmap_write_exec.cpp
index 49495403c..6b7271735 100644
--- a/test/sanitizer_common/TestCases/Linux/mmap_write_exec.cpp
+++ b/test/sanitizer_common/TestCases/Linux/mmap_write_exec.cpp
@@ -1,37 +1,15 @@
 // RUN: %clangxx %s -o %t
 // RUN: %env_tool_opts=detect_write_exec=1 %run %t 2>&1 | FileCheck %s
-// RUN: %env_tool_opts=detect_write_exec=0 %run %t 2>&1 | FileCheck %s \
-// RUN:   --check-prefix=CHECK-DISABLED
-// ubsan and lsan do not install mmap interceptors UNSUPPORTED: ubsan, lsan
+// ubsan and lsan do not install mmap interceptors
+// UNSUPPORTED: ubsan, lsan
 
 // TODO: Fix option on Android, it hangs there for unknown reasons.
 // XFAIL: android
 
-#include <stdio.h>
 #include <sys/mman.h>
 
 int main(int argc, char **argv) {
   char *p = (char *)mmap(0, 1024, PROT_READ | PROT_WRITE | PROT_EXEC,
                          MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
   // CHECK: WARNING: {{.*}}Sanitizer: writable-executable page usage
-  // CHECK: #{{[0-9]+.*}}main{{.*}}mmap_write_exec.cpp:[[@LINE-3]]
-  // CHECK: SUMMARY: {{.*}}Sanitizer: w-and-x-usage
-
-  char *q = (char *)mmap(p, 64, PROT_READ | PROT_WRITE,
-                         MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);
-  (void)mprotect(q, 64, PROT_WRITE | PROT_EXEC);
-  // CHECK: WARNING: {{.*}}Sanitizer: writable-executable page usage
-  // CHECK: #{{[0-9]+.*}}main{{.*}}mmap_write_exec.cpp:[[@LINE-2]]
-  // CHECK: SUMMARY: {{.*}}Sanitizer: w-and-x-usage
-
-  char *a = (char *)mmap(0, 1024, PROT_READ | PROT_WRITE,
-                         MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-  char *b = (char *)mmap(a, 64, PROT_READ | PROT_WRITE,
-                         MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);
-  (void)mprotect(q, 64, PROT_READ | PROT_EXEC);
-  // CHECK-NOT: Sanitizer
-
-  printf("done\n");
-  // CHECK-DISABLED-NOT: Sanitizer
-  // CHECK-DISABLED: done
 }