generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not clear tids on detached threads.

Browse Source 
Make sure that the kernel isn't going to try and clear the tid of
freed memory.

Bug: 11963327
Change-Id: I95d02340bfbe92f56036d2cc58dbf0e3079eb7c3
This commit is contained in:
Christopher Ferris 2013-12-06 18:54:48 -08:00
parent 6afe8ab753
commit 101fb7d963
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/bionic/pthread_exit.cpp
View File

@ -36,6 +36,7 @@
extern "C" void _exit_with_stack_teardown(void*, size_t, int);
extern "C" void __exit(int);
extern "C" int __set_tid_address(int*);
/* CAVEAT: our implementation of pthread_cleanup_push/pop doesn't support C++ exceptions
* and thread cancelation
@ -94,6 +95,9 @@ void pthread_exit(void* return_value) {
pthread_mutex_lock(&gThreadListLock);
if ((thread->attr.flags & PTHREAD_ATTR_FLAG_DETACHED) != 0) {
// The thread is detached, so we can destroy the pthread_internal_t.
// First make sure that the thread does not try to clear the tid since
// it points into memory that will be freed.
__set_tid_address(NULL);
_pthread_internal_remove_locked(thread);
} else {
// Make sure that the pthread_internal_t doesn't have stale pointers to a stack that