From 57b9b442ddab74007b1bf81683c452cc5e679ba0 Mon Sep 17 00:00:00 2001 From: seurer Date: Thu, 8 Nov 2018 22:33:52 +0000 Subject: [PATCH] [PATCH, rs6000] Disable ASLR in sanitizer on powerpc64. Cherry pick powerpc64 sanitizer fix from upstream llvm. See https://reviews.llvm.org/rL346030 and https://reviews.llvm.org/D52900. 2018-11-08 Bill Seurer * libsanitizer/sanitizer_common/sanitizer_linux.cc (CheckASLR): Disable ASLR for powerpc64 when using sanitizers. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@265941 138bc75d-0d04-0410-961f-82ee72b054a4 --- libsanitizer/ChangeLog | 5 +++++ libsanitizer/sanitizer_common/sanitizer_linux.cc | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 6664c63a4f7f..705e7ca1c8ef 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2018-11-08 Bill Seurer + + * libsanitizer/sanitizer_common/sanitizer_linux.cc (CheckASLR): + Disable ASLR for powerpc64 when using sanitizers. + 2018-11-06 Rainer Orth PR sanitizer/80953 diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc index 30d6521f9e90..244b5c3ff833 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc @@ -2008,6 +2008,17 @@ void CheckASLR() { Printf("This sanitizer is not compatible with enabled ASLR\n"); Die(); } +#elif SANITIZER_PPC64V2 + // Disable ASLR for Linux PPC64LE. + int old_personality = personality(0xffffffff); + if (old_personality != -1 && (old_personality & ADDR_NO_RANDOMIZE) == 0) { + VReport(1, "WARNING: Program is being run with address space layout " + "randomization (ASLR) enabled which prevents the thread and " + "memory sanitizers from working on powerpc64le.\n" + "ASLR will be disabled and the program re-executed.\n"); + CHECK_NE(personality(old_personality | ADDR_NO_RANDOMIZE), -1); + ReExec(); + } #else // Do nothing #endif -- 2.47.2