Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit 1078594

Browse files
committed
[msan] Fix infinite recursion when _Unwind_Backtrace calls memcpy
Summary: On PPC64, half the msan tests fail with an infinite recursion through GetStackTrace like this: #0 __msan::GetStackTrace #1 __msan_memcpy #2 ?? () from /lib64/libgcc_s.so.1 #3 ?? () from /lib64/libgcc_s.so.1 #4 _Unwind_Backtrace #5 __sanitizer::BufferedStackTrace::SlowUnwindStack #6 __sanitizer::BufferedStackTrace::Unwind #7 __msan::GetStackTrace #8 __interceptor_calloc #9 _dl_allocate_tls #10 pthread_create@@GLIBC_2.17 #11 __interceptor_pthread_create #12 main The problem is that we call _Unwind_Backtrace to get a stack trace; but _Unwind_Backtrace calls memcpy, which we intercept and try to get another stack trace. This patch fixes it in __msan_memcpy by skipping the stack trace if IsInSymbolizer(). This works because GetStackTrace already creates a SymbolizerScope to "block reports from our interceptors during _Unwind_Backtrace". Reviewers: samsonov, wschmidt, eugenis Reviewed By: eugenis Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D10762 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@240878 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 43c73a0 commit 1078594

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Diff for: lib/msan/msan_interceptors.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,8 @@ void __msan_clear_and_unpoison(void *a, uptr size) {
14411441

14421442
void *__msan_memcpy(void *dest, const void *src, SIZE_T n) {
14431443
if (!msan_inited) return internal_memcpy(dest, src, n);
1444-
if (msan_init_is_running) return REAL(memcpy)(dest, src, n);
1444+
if (msan_init_is_running || __msan::IsInSymbolizer())
1445+
return REAL(memcpy)(dest, src, n);
14451446
ENSURE_MSAN_INITED();
14461447
GET_STORE_STACK_TRACE;
14471448
void *res = REAL(memcpy)(dest, src, n);

0 commit comments

Comments
 (0)