diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-02-11 13:38:57 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-02-11 13:38:57 +0000 |
| commit | 1df9cbe3938900c62cad6819fd98f34c58ce0c3f (patch) | |
| tree | 78c5cfabd60fd09dee31b2a22ef34ff4a3bd8fb3 /lib/asan/asan_stack.h | |
| parent | 11f9ef758b4505ac5c3d9d38f0cdb01fd13e9a8e (diff) | |
[sanitizer] Use system unwinder in signal handlers on Android.
Because of the way Bionic sets up signal stack frames, libc unwinder is unable
to step through it, resulting in broken SEGV stack traces.
Luckily, libcorkscrew.so on Android implements an unwinder that can start with
a signal context, thus sidestepping the issue.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@201151 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_stack.h')
| -rw-r--r-- | lib/asan/asan_stack.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/lib/asan/asan_stack.h b/lib/asan/asan_stack.h index ac7f275bb..f7abb9335 100644 --- a/lib/asan/asan_stack.h +++ b/lib/asan/asan_stack.h @@ -23,11 +23,11 @@ // The pc will be in the position 0 of the resulting stack trace. // The bp may refer to the current frame or to the caller's frame. #if SANITIZER_WINDOWS -#define GET_STACK_TRACE_WITH_PC_AND_BP(max_s, pc, bp, fast) \ - StackTrace stack; \ - stack.Unwind(max_s, pc, bp, 0, 0, fast) +#define GET_STACK_TRACE_WITH_PC_BP_AND_CONTEXT(max_s, pc, bp, context, fast) \ + StackTrace stack; \ + stack.Unwind(max_s, pc, bp, context, 0, 0, fast) #else -#define GET_STACK_TRACE_WITH_PC_AND_BP(max_s, pc, bp, fast) \ +#define GET_STACK_TRACE_WITH_PC_BP_AND_CONTEXT(max_s, pc, bp, context, fast) \ StackTrace stack; \ { \ AsanThread *t; \ @@ -37,10 +37,10 @@ uptr stack_top = t->stack_top(); \ uptr stack_bottom = t->stack_bottom(); \ ScopedUnwinding unwind_scope(t); \ - stack.Unwind(max_s, pc, bp, stack_top, stack_bottom, fast); \ + stack.Unwind(max_s, pc, bp, context, stack_top, stack_bottom, fast); \ } else if (t == 0 && !fast) { \ /* If GetCurrentThread() has failed, try to do slow unwind anyways. */ \ - stack.Unwind(max_s, pc, bp, 0, 0, false); \ + stack.Unwind(max_s, pc, bp, context, 0, 0, false); \ } \ } \ } @@ -50,13 +50,17 @@ // as early as possible (in functions exposed to the user), as we generally // don't want stack trace to contain functions from ASan internals. -#define GET_STACK_TRACE(max_size, fast) \ - GET_STACK_TRACE_WITH_PC_AND_BP(max_size, \ - StackTrace::GetCurrentPc(), GET_CURRENT_FRAME(), fast) +#define GET_STACK_TRACE(max_size, fast) \ + GET_STACK_TRACE_WITH_PC_BP_AND_CONTEXT(max_size, StackTrace::GetCurrentPc(), \ + GET_CURRENT_FRAME(), 0, fast) -#define GET_STACK_TRACE_FATAL(pc, bp) \ - GET_STACK_TRACE_WITH_PC_AND_BP(kStackTraceMax, pc, bp, \ - common_flags()->fast_unwind_on_fatal) +#define GET_STACK_TRACE_FATAL(pc, bp) \ + GET_STACK_TRACE_WITH_PC_BP_AND_CONTEXT(kStackTraceMax, pc, bp, 0, \ + common_flags()->fast_unwind_on_fatal) + +#define GET_STACK_TRACE_SIGNAL(pc, bp, context) \ + GET_STACK_TRACE_WITH_PC_BP_AND_CONTEXT(kStackTraceMax, pc, bp, context, \ + common_flags()->fast_unwind_on_fatal) #define GET_STACK_TRACE_FATAL_HERE \ GET_STACK_TRACE(kStackTraceMax, common_flags()->fast_unwind_on_fatal) |