Fix pointer dereferencing problems in _pthread_mutex_init_calloc_cb() that

were obscured by pseudo-opaque pthreads API pointer casting.

2 files changed, 5 insertions, 8 deletions

diff --git a/lib/libkse/thread/thr_mutex.c b/lib/libkse/thread/thr_mutex.c
index d8bf498..3a3546b 100644
--- a/lib/libkse/thread/thr_mutex.c
+++ b/lib/libkse/thread/thr_mutex.c
@@ -254,8 +254,9 @@ _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
 		.m_ceiling = 0,
 		.m_flags = 0
 	};
+	static const struct pthread_mutex_attr *pattr = &attr;
 
-	return (thr_mutex_init(mutex, (pthread_mutexattr_t *)&attr,
+	return (thr_mutex_init(mutex, (pthread_mutexattr_t *)&pattr,
 	    calloc_cb));
 }
 
diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c
index 35b6352..fc233b6 100644
--- a/lib/libthr/thread/thr_mutex.c
+++ b/lib/libthr/thread/thr_mutex.c
@@ -212,19 +212,15 @@ int
 _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
     void *(calloc_cb)(size_t, size_t))
 {
-/* XXX Enable adaptive locking if similar code is removed from malloc. */
-#if 0
 	static const struct pthread_mutex_attr attr = {
-		.m_type = PTHREAD_MUTEX_ADAPTIVE_NP,
+		.m_type = PTHREAD_MUTEX_NORMAL,
 		.m_protocol = PTHREAD_PRIO_NONE,
 		.m_ceiling = 0,
 		.m_flags = 0
 	};
+	static const struct pthread_mutex_attr *pattr = &attr;
 
-	return mutex_init(mutex, (pthread_mutexattr_t *)&attr, 0, calloc_cb);
-#else
-	return mutex_init(mutex, NULL, 0, calloc_cb);
-#endif
+	return mutex_init(mutex, (pthread_mutexattr_t *)&pattr, 0, calloc_cb);
 }
 
 void