diff options
| author | Elliott Hughes <enh@google.com> | 2013-11-15 17:40:18 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-11-18 19:48:11 -0800 |
| commit | 877ec6d90418ff1d6597147d355a2229fdffae7e (patch) | |
| tree | e475221a7fbff1564ad37548e920333c49cc5873 /libc/arch-x86 | |
| parent | f246c589d66e5dc0e3cddc3c37261fb0e3fc67e9 (diff) | |
| download | bionic-877ec6d90418ff1d6597147d355a2229fdffae7e.zip bionic-877ec6d90418ff1d6597147d355a2229fdffae7e.tar.gz bionic-877ec6d90418ff1d6597147d355a2229fdffae7e.tar.bz2 | |
Fix pthread_join.
Let the kernel keep pthread_internal_t::tid updated, including
across forks and for the main thread. This then lets us fix
pthread_join to only return after the thread has really exited.
Also fix the thread attributes of the main thread so we don't
unmap the main thread's stack (which is really owned by the
dynamic linker and contains things like environment variables),
which fixes crashes when joining with an exited main thread
and also fixes problems reported publicly with accessing environment
variables after the main thread exits (for which I've added a new
unit test).
In passing I also fixed a bug where if the clone(2) inside
pthread_create(3) fails, we'd unmap the child's stack and TLS (which
contains the mutex) and then try to unlock the mutex. Boom! It wasn't
until after I'd uploaded the fix for this that I came across a new
public bug reporting this exact failure.
Bug: 8206355
Bug: 11693195
Bug: https://code.google.com/p/android/issues/detail?id=57421
Bug: https://code.google.com/p/android/issues/detail?id=62392
Change-Id: I2af9cf6e8ae510a67256ad93cad891794ed0580b
Diffstat (limited to 'libc/arch-x86')
| -rw-r--r-- | libc/arch-x86/syscalls.mk | 1 | ||||
| -rw-r--r-- | libc/arch-x86/syscalls/__set_tid_address.S | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/libc/arch-x86/syscalls.mk b/libc/arch-x86/syscalls.mk index 70e6e39..b6a1e38 100644 --- a/libc/arch-x86/syscalls.mk +++ b/libc/arch-x86/syscalls.mk @@ -24,6 +24,7 @@ syscall_src += arch-x86/syscalls/__rt_sigsuspend.S syscall_src += arch-x86/syscalls/__rt_sigtimedwait.S syscall_src += arch-x86/syscalls/__sched_getaffinity.S syscall_src += arch-x86/syscalls/__set_thread_area.S +syscall_src += arch-x86/syscalls/__set_tid_address.S syscall_src += arch-x86/syscalls/__sigaction.S syscall_src += arch-x86/syscalls/__statfs64.S syscall_src += arch-x86/syscalls/__syslog.S diff --git a/libc/arch-x86/syscalls/__set_tid_address.S b/libc/arch-x86/syscalls/__set_tid_address.S new file mode 100644 index 0000000..0c66d47 --- /dev/null +++ b/libc/arch-x86/syscalls/__set_tid_address.S @@ -0,0 +1,20 @@ +/* Generated by gensyscalls.py. Do not edit. */ + +#include <private/bionic_asm.h> + +ENTRY(__set_tid_address) + pushl %ebx + mov 8(%esp), %ebx + movl $__NR_set_tid_address, %eax + int $0x80 + cmpl $-MAX_ERRNO, %eax + jb 1f + negl %eax + pushl %eax + call __set_errno + addl $4, %esp + orl $-1, %eax +1: + popl %ebx + ret +END(__set_tid_address) |