2 files changed, 10 insertions, 0 deletions

diff --git a/lib/libpthread/man/sem_post.3 b/lib/libpthread/man/sem_post.3
index 906d86d87c2b9..34fef83c614d9 100644
--- a/lib/libpthread/man/sem_post.3
+++ b/lib/libpthread/man/sem_post.3
@@ -48,6 +48,9 @@ If there are threads blocked on the semaphore when
 is called, then the highest priority thread that has been blocked the longest on
 the semaphore will be allowed to return from
 .Fn sem_wait .
+.Pp
+.Fn sem_post
+is signal-reentrant and may be called within signal handlers.
 .Sh RETURN VALUES
 If successful,
 .Fn sem_post
diff --git a/lib/libpthread/thread/thr_sem.c b/lib/libpthread/thread/thr_sem.c
index 10dec5ed036fe..5a4757c5388ec 100644
--- a/lib/libpthread/thread/thr_sem.c
+++ b/lib/libpthread/thread/thr_sem.c
@@ -206,6 +206,12 @@ sem_post(sem_t *sem)
 
 	_SEM_CHECK_VALIDITY(sem);
 
+	/*
+	 * sem_post() is required to be safe to call from within signal
+	 * handlers.  Thus, we must defer signals.
+	 */
+	_thread_kern_sig_defer();
+
 	pthread_mutex_lock(&(*sem)->lock);
 
 	(*sem)->count++;
@@ -221,6 +227,7 @@ sem_post(sem_t *sem)
 
 	pthread_mutex_unlock(&(*sem)->lock);
 
+	_thread_kern_sig_defer();
 	retval = 0;
   RETURN:
 	return retval;