1 files changed, 10 insertions, 0 deletions

diff --git a/lib/libpthread/thread/thr_join.c b/lib/libpthread/thread/thr_join.c
index 63d0d5880bec..9e86a0154b6b 100644
--- a/lib/libpthread/thread/thr_join.c
+++ b/lib/libpthread/thread/thr_join.c
@@ -42,6 +42,16 @@ pthread_join(pthread_t pthread, void **thread_return)
 	int             status;
 	pthread_t	pthread1;
 
+	/* Check if the caller has specified an invalid thread: */
+	if (pthread == NULL || pthread->magic != PTHREAD_MAGIC)
+		/* Invalid thread: */
+		return(EINVAL);
+
+	/* Check if the caller has specified itself: */
+	if (pthread == _thread_run)
+		/* Avoid a deadlock condition: */
+		return(EDEADLK);
+
 	/* Block signals: */
 	_thread_kern_sig_block(&status);