summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-01-22 09:07:02 +0000
committerkib <kib@FreeBSD.org>2015-01-22 09:07:02 +0000
commit2247a6699648e6e29de6f734e0cc94db00c55f54 (patch)
treeda538dc24b1b35ffca5926c6578b7eeab05655dc
parentf831eecaca2fe0d91aed84e402bf0d8bfd00f507 (diff)
downloadFreeBSD-src-2247a6699648e6e29de6f734e0cc94db00c55f54.zip
FreeBSD-src-2247a6699648e6e29de6f734e0cc94db00c55f54.tar.gz
MFC r277236:
For sigaction(2), ignore possible garbage in sa_flags for sa_handler == SIG_DFL or SIG_IGN.
-rw-r--r--sys/kern/kern_sig.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 05dd103..cdb5f93 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -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);
OpenPOWER on IntegriCloud