Skip to content

[compiler-rt][TSan] fix crash caused by intercpting pthread_detach on Android #161596

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
merged 2 commits into from
Oct 6, 2025
Merged

[compiler-rt][TSan] fix crash caused by intercpting pthread_detach on Android #161596

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
528c47b
[compiler-rt][TSan] fix crash caused by intercpting pthread_detach on…
airpfei Oct 1, 2025
46e63ea
update comment
airpfei Oct 5, 2025
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
16 changes: 16 additions & 0 deletions compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,6 +1130,22 @@ TSAN_INTERCEPTOR(int, pthread_create,

TSAN_INTERCEPTOR(int, pthread_join, void *th, void **ret) {
SCOPED_INTERCEPTOR_RAW(pthread_join, th, ret);
#if SANITIZER_ANDROID
{
// In Bionic, if the target thread has already exited when pthread_detach is
// called, pthread_detach will call pthread_join internally to clean it up.
// In that case, the thread has already been consumed by the pthread_detach
// interceptor.
Tid tid = ctx->thread_registry.FindThread(
[](ThreadContextBase* tctx, void* arg) {
return tctx->user_id == (uptr)arg;
},
th);
if (tid == kInvalidTid) {
return REAL(pthread_join)(th, ret);
}
}
#endif
Tid tid = ThreadConsumeTid(thr, pc, (uptr)th);
ThreadIgnoreBegin(thr, pc);
int res = BLOCK_REAL(pthread_join)(th, ret);
Expand Down