diff options
Diffstat (limited to 'lib/hwasan/hwasan_linux.cc')
| -rw-r--r-- | lib/hwasan/hwasan_linux.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/hwasan/hwasan_linux.cc b/lib/hwasan/hwasan_linux.cc index af9378c31..5b0a8b4ac 100644 --- a/lib/hwasan/hwasan_linux.cc +++ b/lib/hwasan/hwasan_linux.cc @@ -40,6 +40,7 @@ #include "sanitizer_common/sanitizer_procmaps.h" #if HWASAN_WITH_INTERCEPTORS && !SANITIZER_ANDROID +SANITIZER_INTERFACE_ATTRIBUTE THREADLOCAL uptr __hwasan_tls; #endif @@ -301,7 +302,12 @@ void AndroidTestTlsSlot() {} #endif Thread *GetCurrentThread() { - auto *R = (StackAllocationsRingBuffer*)GetCurrentThreadLongPtr(); + uptr *ThreadLong = GetCurrentThreadLongPtr(); +#if HWASAN_WITH_INTERCEPTORS + if (!*ThreadLong) + __hwasan_thread_enter(); +#endif + auto *R = (StackAllocationsRingBuffer *)ThreadLong; return hwasanThreadList().GetThreadByBufferAddress((uptr)(R->Next())); } |