svn commit: r277526 - stable/10/sys/kern

[Konstantin Belousov]

Author: kib
Date: Thu Jan 22 09:07:02 2015
New Revision: 277526
URL: https://svnweb.freebsd.org/changeset/base/277526

Log:
  MFC r277236:
  For sigaction(2), ignore possible garbage in sa_flags for sa_handler
  == SIG_DFL or SIG_IGN.

Modified:
  stable/10/sys/kern/kern_sig.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_sig.c
==============================================================================
--- stable/10/sys/kern/kern_sig.c	Thu Jan 22 09:02:58 2015	(r277525)
+++ stable/10/sys/kern/kern_sig.c	Thu Jan 22 09:07:02 2015	(r277526)
@@ -658,9 +658,10 @@ kern_sigaction(td, sig, act, oact, flags
 
 	if (!_SIG_VALID(sig))
 		return (EINVAL);
-	if (act != NULL && (act->sa_flags & ~(SA_ONSTACK | SA_RESTART |
-	    SA_RESETHAND | SA_NOCLDSTOP | SA_NODEFER | SA_NOCLDWAIT |
-	    SA_SIGINFO)) != 0)
+	if (act != NULL && act->sa_handler != SIG_DFL &&
+	    act->sa_handler != SIG_IGN && (act->sa_flags & ~(SA_ONSTACK |
+	    SA_RESTART | SA_RESETHAND | SA_NOCLDSTOP | SA_NODEFER |
+	    SA_NOCLDWAIT | SA_SIGINFO)) != 0)
 		return (EINVAL);
 
 	PROC_LOCK(p);