getservbyport_r: fix out-of-bounds buffer read

[musl] / src / thread / pthread_mutex_lock.c

diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c
index 87b1975..638d4b8 100644 (file)
--- a/src/thread/pthread_mutex_lock.c
+++ b/src/thread/pthread_mutex_lock.c
@@ -1,18 +1,12 @@
 #include "pthread_impl.h"
 
-int pthread_mutex_lock(pthread_mutex_t *m)
+int __pthread_mutex_lock(pthread_mutex_t *m)
 {
-       int r;
-
-       if (m->_m_type == PTHREAD_MUTEX_NORMAL && !a_swap(&m->_m_lock, 1))
+       if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
+           && !a_cas(&m->_m_lock, 0, EBUSY))
                return 0;
 
-       while ((r=pthread_mutex_trylock(m)) == EBUSY) {
-               if (!(r=m->_m_lock) || (r&0x40000000)) continue;
-               if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK
-                && (r&0x1fffffff) == pthread_self()->tid)
-                       return EDEADLK;
-               __wait(&m->_m_lock, &m->_m_waiters, r, 0);
-       }
-       return r;
+       return __pthread_mutex_timedlock(m, 0);
 }
+
+weak_alias(__pthread_mutex_lock, pthread_mutex_lock);