Skip to content

Re-sync asan_emscripten with asan_interceptors. NFC. #14516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
Jun 24, 2021
Merged

Re-sync asan_emscripten with asan_interceptors. NFC. #14516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions system/lib/compiler-rt/lib/asan/asan_emscripten.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,7 @@ extern "C" {
}

static thread_return_t THREAD_CALLING_CONV asan_thread_start(void *arg) {
atomic_uintptr_t *param = reinterpret_cast<atomic_uintptr_t *>(arg);
AsanThread *t = nullptr;
while ((t = reinterpret_cast<AsanThread *>(
atomic_load(param, memory_order_acquire))) == nullptr)
internal_sched_yield();
emscripten_builtin_free(param);
AsanThread *t = (AsanThread *)arg;
SetCurrentThread(t);
return t->ThreadStart(GetTid());
}
Expand All @@ -80,9 +75,11 @@ INTERCEPTOR(int, pthread_create, void *thread,
int detached = 0;
if (attr && attr != __ATTRP_C11_THREAD)
pthread_attr_getdetachstate(attr, &detached);
atomic_uintptr_t *param = (atomic_uintptr_t *)
emscripten_builtin_malloc(sizeof(atomic_uintptr_t));
atomic_store(param, 0, memory_order_relaxed);

u32 current_tid = GetCurrentTidOrInvalid();
AsanThread *t =
AsanThread::Create(start_routine, arg, current_tid, &stack, detached);

int result;
{
// Ignore all allocations made by pthread_create: thread stack/TLS may be
Expand All @@ -92,13 +89,13 @@ INTERCEPTOR(int, pthread_create, void *thread,
#if CAN_SANITIZE_LEAKS
__lsan::ScopedInterceptorDisabler disabler;
#endif
result = REAL(pthread_create)(thread, attr, asan_thread_start, param);
result = REAL(pthread_create)(thread, attr, asan_thread_start, t);
}
if (result == 0) {
u32 current_tid = GetCurrentTidOrInvalid();
AsanThread *t =
AsanThread::Create(start_routine, arg, current_tid, &stack, detached);
atomic_store(param, reinterpret_cast<uptr>(t), memory_order_release);
if (result != 0) {
// If the thread didn't start delete the AsanThread to avoid leaking it.
// Note AsanThreadContexts never get destroyed so the AsanThreadContext
// that was just created for the AsanThread is wasted.
t->Destroy();
}
return result;
}
Expand Down