diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-23 12:34:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-23 12:34:02 -0800 |
| commit | 7dbbfac0fc7bbca072885185bf9bbee9e2e40e63 (patch) | |
| tree | 370f409cef0ea8eb6050a16584dff1bb403c5aa3 | |
| parent | 76ab561b4dd30711d82060d66b599aece0a40878 (diff) | |
| parent | 5d8fd2a0bc059cd07405a372c98617829f8ac378 (diff) | |
| download | android_bionic-7dbbfac0fc7bbca072885185bf9bbee9e2e40e63.tar.gz android_bionic-7dbbfac0fc7bbca072885185bf9bbee9e2e40e63.tar.bz2 android_bionic-7dbbfac0fc7bbca072885185bf9bbee9e2e40e63.zip | |
am 5d8fd2a0: am a71aefc6: am d041bf20: Merge "bionic/x86: fix one potential deadlock in __set_tls()"
* commit '5d8fd2a0bc059cd07405a372c98617829f8ac378':
bionic/x86: fix one potential deadlock in __set_tls()
| -rwxr-xr-x | libc/arch-x86/bionic/__set_tls.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libc/arch-x86/bionic/__set_tls.c b/libc/arch-x86/bionic/__set_tls.c index e5e43b591..7ed4b0152 100755 --- a/libc/arch-x86/bionic/__set_tls.c +++ b/libc/arch-x86/bionic/__set_tls.c @@ -83,6 +83,7 @@ int __set_tls(void *ptr) if (rc != 0) { /* could not set thread local area */ + pthread_mutex_unlock(&_tls_desc_lock); return -1; } |