avoid crash on stupid but allowable usage of pthread_mutex_unlock
authorRich Felker <dalias@aerifal.cx>
Wed, 30 Mar 2011 14:32:45 +0000 (10:32 -0400)
committerRich Felker <dalias@aerifal.cx>
Wed, 30 Mar 2011 14:32:45 +0000 (10:32 -0400)
unlocking an unlocked mutex is not UB for robust or error-checking
mutexes, so we must avoid calling __pthread_self (which might crash
due to lack of thread-register initialization) until after checking
that the mutex is locked.

src/thread/pthread_mutex_unlock.c

index 5855db0b588f613803b9000a86edfada657c7d08..6c4d7f22a041dce6d7e05b3f6f436888cc1a9e2d 100644 (file)
@@ -5,9 +5,11 @@ int pthread_mutex_unlock(pthread_mutex_t *m)
        pthread_t self;
 
        if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
+               if (!m->_m_lock)
+                       return EPERM;
                self = __pthread_self();
                if ((m->_m_lock&0x1fffffff) != self->tid)
-                       return EPERM;
+                       return EPERM;
                if ((m->_m_type&3) == PTHREAD_MUTEX_RECURSIVE && --m->_m_count)
                        return 0;
                if (m->_m_type >= 4) {