Revert "Mmap interceptor new option, Write Exec runtime detector"
Breaks Android bot.
This reverts commit r327747.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@327762 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/sanitizer_common/sanitizer_common.h b/lib/sanitizer_common/sanitizer_common.h
index b49e3d8..0a92e77 100644
--- a/lib/sanitizer_common/sanitizer_common.h
+++ b/lib/sanitizer_common/sanitizer_common.h
@@ -378,8 +378,6 @@
void ReportErrorSummary(const char *error_type, const StackTrace *trace,
const char *alt_tool_name = nullptr);
-void ReportMmapWriteExec();
-
// Math
#if SANITIZER_WINDOWS && !defined(__clang__) && !defined(__GNUC__)
extern "C" {
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc
index 8c0c3f0..0950f6a 100644
--- a/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -6887,8 +6887,6 @@
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();
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);
@@ -6903,8 +6901,6 @@
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();
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 2e028bc..5cdfbbb 100644
--- a/lib/sanitizer_common/sanitizer_common_libcdep.cc
+++ b/lib/sanitizer_common/sanitizer_common_libcdep.cc
@@ -81,32 +81,6 @@
#endif
}
-void ReportMmapWriteExec() {
-#if !SANITIZER_GO
- ScopedErrorReportLock l;
- SanitizerCommonDecorator d;
-
- InternalScopedBuffer<BufferedStackTrace> stack_buffer(1);
- BufferedStackTrace *stack = stack_buffer.data();
- stack->Reset();
- uptr top = 0;
- uptr bottom = 0;
- GET_CALLER_PC_BP_SP;
- (void)sp;
- bool fast = common_flags()->fast_unwind_on_fatal;
- if (fast)
- GetThreadStackTopAndBottom(false, &top, &bottom);
- stack->Unwind(kStackTraceMax, pc, bp, nullptr, top, bottom, fast);
-
- Printf("%s", d.Warning());
- Report("WARNING: %s: writable-executable page usage\n", SanitizerToolName);
- Printf("%s", d.Default());
-
- stack->Print();
- ReportErrorSummary("w-and-x-usage", stack);
-#endif
-}
-
static void (*SoftRssLimitExceededCallback)(bool exceeded);
void SetSoftRssLimitExceededCallback(void (*Callback)(bool exceeded)) {
CHECK_EQ(SoftRssLimitExceededCallback, nullptr);
diff --git a/lib/sanitizer_common/sanitizer_flags.inc b/lib/sanitizer_common/sanitizer_flags.inc
index e607e51..e231a8a 100644
--- a/lib/sanitizer_common/sanitizer_flags.inc
+++ b/lib/sanitizer_common/sanitizer_flags.inc
@@ -240,6 +240,3 @@
COMMON_FLAG(bool, dump_registers, true,
"If true, dump values of CPU registers when SEGV happens. Only "
"available on OS X for now.")
-COMMON_FLAG(bool, detect_write_exec, false,
- "If true, triggers warning when writable-executable pages requests "
- "are being made")
diff --git a/test/sanitizer_common/TestCases/Linux/mmap_write_exec.cpp b/test/sanitizer_common/TestCases/Linux/mmap_write_exec.cpp
deleted file mode 100644
index 2758322..0000000
--- a/test/sanitizer_common/TestCases/Linux/mmap_write_exec.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %clangxx %s -o %t
-// RUN: %env_tool_opts=detect_write_exec=1 %run %t 2>&1 | FileCheck %s
-// ubsan and lsan do not install mmap interceptors
-// UNSUPPORTED: ubsan, lsan
-
-#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
-}
