aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog4
-rw-r--r--linuxthreads/condvar.c8
2 files changed, 12 insertions, 0 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 2a7bcb9..725653b 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,9 @@
2000-03-14 Ulrich Drepper <drepper@redhat.com>
+ * condvar.c (pthread_cond_wait): Check whether mutex is owned by
+ current thread and return error if not.
+ (pthread_cond_timedwait): Likewise.
+
* mutex.c (__pthread_once): Handle cancelled init function correctly.
(pthread_once_cancelhandler): New function.
Patch by Kaz Kylheku <kaz@ashi.footprints.net>.
diff --git a/linuxthreads/condvar.c b/linuxthreads/condvar.c
index 410ca65..d1e91d2 100644
--- a/linuxthreads/condvar.c
+++ b/linuxthreads/condvar.c
@@ -77,6 +77,10 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
pthread_extricate_if extr;
int already_canceled = 0;
+ /* Check whether the mutex is locked and owned by this thread. */
+ if (mutex->__m_owner != self)
+ return EINVAL;
+
/* Set up extrication interface */
extr.pu_object = cond;
extr.pu_extricate_func = cond_extricate_func;
@@ -380,6 +384,10 @@ pthread_cond_timedwait_relative_new(pthread_cond_t *cond,
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
const struct timespec * abstime)
{
+ /* Check whether the mutex is locked and owned by this thread. */
+ if (mutex->__m_owner != self)
+ return EINVAL;
+
/* Indirect call through pointer! */
return pthread_cond_tw_rel(cond, mutex, abstime);
}