diff options
Diffstat (limited to 'lib/msan')
| -rw-r--r-- | lib/msan/msan.cc | 11 | ||||
| -rw-r--r-- | lib/msan/msan.h | 13 |
2 files changed, 22 insertions, 2 deletions
diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc index e6226ba76..227f35ae1 100644 --- a/lib/msan/msan.cc +++ b/lib/msan/msan.cc @@ -379,6 +379,14 @@ static void MsanOnDeadlySignal(int signo, void *siginfo, void *context) { HandleDeadlySignal(siginfo, context, GetTid(), &OnStackUnwind, nullptr); } +static void MsanCheckFailed(const char *file, int line, const char *cond, + u64 v1, u64 v2) { + Report("MemorySanitizer CHECK failed: %s:%d \"%s\" (0x%zx, 0x%zx)\n", file, + line, cond, (uptr)v1, (uptr)v2); + PRINT_CURRENT_STACK_CHECK(); + Die(); +} + void __msan_init() { CHECK(!msan_init_is_running); if (msan_inited) return; @@ -391,6 +399,9 @@ void __msan_init() { CacheBinaryName(); InitializeFlags(); + // Install tool-specific callbacks in sanitizer_common. + SetCheckFailedCallback(MsanCheckFailed); + __sanitizer_set_report_path(common_flags()->log_path); InitializeInterceptors(); diff --git a/lib/msan/msan.h b/lib/msan/msan.h index cbae44412..ad1b86495 100644 --- a/lib/msan/msan.h +++ b/lib/msan/msan.h @@ -356,14 +356,23 @@ const int STACK_TRACE_TAG_POISON = StackTrace::TAG_CUSTOM + 1; common_flags()->fast_unwind_on_malloc); \ } +#define GET_STORE_STACK_TRACE \ + GET_STORE_STACK_TRACE_PC_BP(StackTrace::GetCurrentPc(), GET_CURRENT_FRAME()) + #define GET_FATAL_STACK_TRACE_PC_BP(pc, bp) \ BufferedStackTrace stack; \ if (msan_inited) \ GetStackTrace(&stack, kStackTraceMax, pc, bp, nullptr, \ common_flags()->fast_unwind_on_fatal) -#define GET_STORE_STACK_TRACE \ - GET_STORE_STACK_TRACE_PC_BP(StackTrace::GetCurrentPc(), GET_CURRENT_FRAME()) +#define GET_FATAL_STACK_TRACE_HERE \ + GET_FATAL_STACK_TRACE_PC_BP(StackTrace::GetCurrentPc(), GET_CURRENT_FRAME()) + +#define PRINT_CURRENT_STACK_CHECK() \ + { \ + GET_FATAL_STACK_TRACE_HERE; \ + stack.Print(); \ + } class ScopedThreadLocalStateBackup { public: |