Check SIG_HOLD action ealier to avoid missing test it in later code.

1 files changed, 7 insertions, 9 deletions

diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 65a07d0..c088409 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1639,7 +1639,13 @@ tdsignal(struct thread *td, int sig)
 	}
 	SIGADDSET(*siglist, sig);
 	signotify(td);			/* uses schedlock */
-
+	/*
+	 * Defer further processing for signals which are held,
+	 * except that stopped processes must be continued by SIGCONT.
+	 */
+	if (action == SIG_HOLD &&
+	    !((prop & SA_CONT) && (p->p_flag & P_STOPPED_SIG)))
+                return;
 	/*
 	 * Some signals have a process-wide effect and a per-thread
 	 * component.  Most processing occurs when the process next
@@ -1817,14 +1823,6 @@ tdsigwakeup(struct thread *td, int sig, sig_t action)
 			td->td_priority = PUSER;
 		}
 	}
-
-	/*
-	 * Defer further processing for signals which are held,
-	 * except that stopped processes must be continued by SIGCONT.
-	 */
-	if (action == SIG_HOLD) {
-		return;
-	}
 	if (TD_IS_SLEEPING(td)) {
 		/*
 		 * If thread is sleeping uninterruptibly