From 327fbd6df749c64c9896b61cb7caa80db347df00 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 9 Dec 2013 15:25:16 -0600 Subject: [PATCH] condwaitsupp.c: Return EPERM if waiting and mutex is not locked This error check was commented out because it is not in the POSIX specification. However, the GNU/Linux manual page does document that EPERM is to be returned in this situation. --- cpukit/posix/src/condwaitsupp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cpukit/posix/src/condwaitsupp.c b/cpukit/posix/src/condwaitsupp.c index a13d4f70f4..e5299075bc 100644 --- a/cpukit/posix/src/condwaitsupp.c +++ b/cpukit/posix/src/condwaitsupp.c @@ -58,13 +58,17 @@ int _POSIX_Condition_variables_Wait_support( return EINVAL; } - (void) pthread_mutex_unlock( mutex ); -/* XXX ignore this for now since behavior is undefined + + mutex_status = pthread_mutex_unlock( mutex ); + /* + * Historically, we ignored the return code since the behavior + * is undefined by POSIX. But GNU/Linux returns EPERM in this + * case, so we follow their lead. + */ if ( mutex_status ) { _Objects_Put( &the_cond->Object ); - return EINVAL; + return EPERM; } -*/ if ( !already_timedout ) { the_cond->Mutex = *mutex;