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

am e480fc83: bionic: fix pthread_{create, exit}/signal race condition

Browse Source 
* commit 'e480fc83b2887388d469eb3bf58c86c610f5b082':
  bionic: fix pthread_{create, exit}/signal race condition
This commit is contained in:
Jack Ren 2011-11-29 22:42:32 -08:00 committed by Android Git Automerger
commit 0c3d21e63c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-x86/bionic/clone.S
View File

@ -22,6 +22,7 @@ __pthread_clone:
movl %eax, -8(%ecx) movl %eax, -8(%ecx)
movl %ecx, -4(%ecx) movl %ecx, -4(%ecx)
subl $16, %ecx
movl $__NR_clone, %eax movl $__NR_clone, %eax
int $0x80 int $0x80
test %eax, %eax test %eax, %eax
@ -39,7 +40,6 @@ __pthread_clone:
# we're in the child thread now, call __thread_entry # we're in the child thread now, call __thread_entry
# with the appropriate arguments on the child stack # with the appropriate arguments on the child stack
# we already placed most of them # we already placed most of them
subl $16, %esp
jmp __thread_entry jmp __thread_entry
hlt hlt

5
libc/bionic/pthread.c
View File

@ -571,6 +571,7 @@ void pthread_exit(void * retval)
void* stack_base = thread->attr.stack_base; void* stack_base = thread->attr.stack_base;
int stack_size = thread->attr.stack_size; int stack_size = thread->attr.stack_size;
int user_stack = (thread->attr.flags & PTHREAD_ATTR_FLAG_USER_STACK) != 0; int user_stack = (thread->attr.flags & PTHREAD_ATTR_FLAG_USER_STACK) != 0;
sigset_t mask;
// call the cleanup handlers first // call the cleanup handlers first
while (thread->cleanup_stack) { while (thread->cleanup_stack) {
@ -613,6 +614,10 @@ void pthread_exit(void * retval)
pthread_mutex_unlock(&gThreadListLock); pthread_mutex_unlock(&gThreadListLock);
} }
sigfillset(&mask);
sigdelset(&mask, SIGSEGV);
(void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
// destroy the thread stack // destroy the thread stack
if (user_stack) if (user_stack)
_exit_thread((int)retval); _exit_thread((int)retval);