From a89ad664b1bd732581a11af290315c8d3be91d71 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Mon, 21 Jul 2014 21:33:46 +0000 Subject: [PATCH] [ASan] Fix __asan_describe_address and add a test for it. llvm-svn: 213583 --- compiler-rt/lib/asan/asan_report.cc | 3 +++ compiler-rt/test/asan/TestCases/describe_address.cc | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 compiler-rt/test/asan/TestCases/describe_address.cc diff --git a/compiler-rt/lib/asan/asan_report.cc b/compiler-rt/lib/asan/asan_report.cc index 3135e10..395cefe 100644 --- a/compiler-rt/lib/asan/asan_report.cc +++ b/compiler-rt/lib/asan/asan_report.cc @@ -945,7 +945,10 @@ void NOINLINE __asan_set_error_report_callback(void (*callback)(const char*)) { } void __asan_describe_address(uptr addr) { + // Thread registry must be locked while we're describing an address. + asanThreadRegistry().Lock(); DescribeAddress(addr, 1); + asanThreadRegistry().Unlock(); } extern "C" { diff --git a/compiler-rt/test/asan/TestCases/describe_address.cc b/compiler-rt/test/asan/TestCases/describe_address.cc new file mode 100644 index 0000000..868c0eb --- /dev/null +++ b/compiler-rt/test/asan/TestCases/describe_address.cc @@ -0,0 +1,19 @@ +// RUN: %clangxx_asan -O0 %s -o %t && %run %t 2>&1 | FileCheck %s + +#include + +int global; + +int main(int argc, char *argv[]) { + int stack; + int *heap = new int[100]; + __asan_describe_address(heap); + // CHECK: {{.*}} is located 0 bytes inside of 400-byte region + // CHECK: allocated by thread T{{.*}} here + __asan_describe_address(&stack); + // CHECK: Address {{.*}} is located in stack of thread T{{.*}} at offset {{.*}} + __asan_describe_address(&global); + // CHECK: {{.*}} is located 0 bytes inside of global variable 'global' + delete[] heap; + return 0; +} -- 2.7.4