[PATCH] D18003: [tsan] Disable randomized address space on linux when necessary.

Yabin Cui via llvm-commits llvm-commits at lists.llvm.org
Wed Mar 16 11:36:09 PDT 2016


yabinc updated this revision to Diff 50842.
yabinc added a comment.
Herald added subscribers: danalbert, tberghammer, aemerson.

Disable randomized address space only for aarch64.


http://reviews.llvm.org/D18003

Files:
  lib/tsan/rtl/tsan_platform_linux.cc

Index: lib/tsan/rtl/tsan_platform_linux.cc
===================================================================
--- lib/tsan/rtl/tsan_platform_linux.cc
+++ lib/tsan/rtl/tsan_platform_linux.cc
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <sys/mman.h>
+#include <sys/personality.h>
 #include <sys/syscall.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -291,6 +292,16 @@
       SetAddressSpaceUnlimited();
       reexec = true;
     }
+#if defined(__aarch64__)
+    int old_personality = personality(0xffffffff);
+    if (old_personality != -1 && (old_personality & ADDR_NO_RANDOMIZE) == 0) {
+      Report("WARNING: Program is run with randomized virtual address space,"
+             " which wouldn't work with ThreadSanitizer.\n");
+      Report("Re-execing with fixed virtual address space.\n");
+      CHECK(personality(old_personality | ADDR_NO_RANDOMIZE) != -1);
+      reexec = true;
+    }
+#endif
     if (reexec)
       ReExec();
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D18003.50842.patch
Type: text/x-patch
Size: 974 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160316/37e75283/attachment.bin>


More information about the llvm-commits mailing list