[compiler-rt] r267477 - [sanitizers] read/write page fault detection on mac.

Mike Aizatsky via llvm-commits llvm-commits at lists.llvm.org
Mon Apr 25 14:44:43 PDT 2016


Author: aizatsky
Date: Mon Apr 25 16:44:43 2016
New Revision: 267477

URL: http://llvm.org/viewvc/llvm-project?rev=267477&view=rev
Log:
[sanitizers] read/write page fault detection on mac.

Subscribers: kubabrecka

Differential Revision: http://reviews.llvm.org/D19495

Added:
    compiler-rt/trunk/test/asan/TestCases/Posix/segv_read_write.c
      - copied, changed from r267376, compiler-rt/trunk/test/asan/TestCases/Linux/segv_read_write.c
Removed:
    compiler-rt/trunk/test/asan/TestCases/Linux/segv_read_write.c
Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc?rev=267477&r1=267476&r2=267477&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc Mon Apr 25 16:44:43 2016
@@ -500,7 +500,8 @@ void LogFullErrorReport(const char *buff
 }
 
 SignalContext::WriteFlag SignalContext::GetWriteFlag(void *context) {
-  return UNKNOWN;  // FIXME: implement this.
+  ucontext_t *ucontext = static_cast<ucontext_t*>(context);
+  return ucontext->uc_mcontext->__es.__err & 2 /*T_PF_WRITE*/ ? WRITE : READ;
 }
 
 void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {

Removed: compiler-rt/trunk/test/asan/TestCases/Linux/segv_read_write.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/segv_read_write.c?rev=267476&view=auto
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Linux/segv_read_write.c (original)
+++ compiler-rt/trunk/test/asan/TestCases/Linux/segv_read_write.c (removed)
@@ -1,26 +0,0 @@
-// RUN: %clangxx_asan -std=c++11 -O0 %s -o %t
-// RUN: not %run %t       2>&1 | FileCheck %s --check-prefix=READ
-// RUN: not %run %t write 2>&1 | FileCheck %s --check-prefix=WRITE
-// UNSUPPORTED: powerpc64,mips
-
-#include <sys/mman.h>
-
-static volatile int sink;
-__attribute__((noinline)) void Read(int *ptr) { sink = *ptr; }
-__attribute__((noinline)) void Write(int *ptr) { *ptr = 0; }
-int main(int argc, char **argv) {
-  // Writes to shadow are detected as reads from shadow gap (because of how the
-  // shadow mapping works). This is kinda hard to fix. Test a random address in
-  // the application part of the address space.
-  void *volatile p =
-      mmap(nullptr, 4096, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-  munmap(p, 4096);
-  if (argc == 1)
-    Read((int *)p);
-  else
-    Write((int *)p);
-}
-// READ: AddressSanitizer: SEGV on unknown address
-// READ: The signal is caused by a READ memory access.
-// WRITE: AddressSanitizer: SEGV on unknown address
-// WRITE: The signal is caused by a WRITE memory access.

Copied: compiler-rt/trunk/test/asan/TestCases/Posix/segv_read_write.c (from r267376, compiler-rt/trunk/test/asan/TestCases/Linux/segv_read_write.c)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/segv_read_write.c?p2=compiler-rt/trunk/test/asan/TestCases/Posix/segv_read_write.c&p1=compiler-rt/trunk/test/asan/TestCases/Linux/segv_read_write.c&r1=267376&r2=267477&rev=267477&view=diff
==============================================================================
    (empty)




More information about the llvm-commits mailing list