diff options
| author | kib <kib@FreeBSD.org> | 2015-01-16 07:06:58 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-01-16 07:06:58 +0000 |
| commit | f4ea6035eb690a2dced10e3e63dcc1c7b708fc66 (patch) | |
| tree | 3c668da929e5e5b3f4582a837cdfc505f4703642 | |
| parent | b965ae027e5e46ff8bdf5f3e04c2a0f063252381 (diff) | |
| download | FreeBSD-src-f4ea6035eb690a2dced10e3e63dcc1c7b708fc66.zip FreeBSD-src-f4ea6035eb690a2dced10e3e63dcc1c7b708fc66.tar.gz | |
For sigaction(2), ignore possible garbage in sa_flags for sa_handler
== SIG_DFL or SIG_IGN. Sloppy code does not fully initialize struct
sigaction for such cases, and being too demanding in the case of
default handler does not catch anything.
Reported and tested by: Alex Tutubalin <lexa@lexa.ru>
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
| -rw-r--r-- | sys/kern/kern_sig.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index a4f0f88..06d8e99 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -653,9 +653,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); |
