1 files changed, 18 insertions, 2 deletions

diff --git a/lib/libc/gen/sem.c b/lib/libc/gen/sem.c
index e37eccd1e00f..e9a918b350ff 100644
--- a/lib/libc/gen/sem.c
+++ b/lib/libc/gen/sem.c
@@ -254,7 +254,19 @@ sem_unlink(const char *name)
 	return (ksem_unlink(name));
 }
 
-int
+static void
+decrease_nwaiters(void *arg)
+{
+	sem_t *sem = (sem_t *)arg;
+
+	(*sem)->nwaiters--;
+	/*
+	 * this function is called from cancellation point,
+	 * the mutex should already be hold.
+	 */
+	_pthread_mutex_unlock(&(*sem)->lock);
+}
+
 sem_wait(sem_t *sem)
 {
 	int	retval;
@@ -266,11 +278,15 @@ sem_wait(sem_t *sem)
 		goto RETURN;
 	}
 
+	_pthread_testcancel();
+
 	_pthread_mutex_lock(&(*sem)->lock);
 
 	while ((*sem)->count == 0) {
 		(*sem)->nwaiters++;
-		_pthread_cond_wait(&(*sem)->gtzero, &(*sem)->lock);
+		_pthread_cleanup_push(decrease_nwaiters);
+		pthread_cond_wait(&(*sem)->gtzero, &(*sem)->lock);
+		pthread_cleanup_pop(0);
 		(*sem)->nwaiters--;
 	}
 	(*sem)->count--;