summaryrefslogtreecommitdiff
path: root/src/signal
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-12-15 23:20:36 -0500
committerRich Felker <dalias@aerifal.cx>2015-12-15 23:20:36 -0500
commit42216742cd69e52e70aeb1d14498a8145872de52 (patch)
treed4cf6347d58e57d24bdd6d0931541a64d213e771 /src/signal
parent0d58bf2d6078dd486951cdeb24790043eb171081 (diff)
downloadmusl-42216742cd69e52e70aeb1d14498a8145872de52.tar.gz
musl-42216742cd69e52e70aeb1d14498a8145872de52.tar.bz2
musl-42216742cd69e52e70aeb1d14498a8145872de52.tar.xz
musl-42216742cd69e52e70aeb1d14498a8145872de52.zip
fix crash when signal number 0 is passed to sigaction
this error case was overlooked in the old range checking logic. new check is moved out of __libc_sigaction to the public wrapper in order to unify the error path and reduce code size.
Diffstat (limited to 'src/signal')
-rw-r--r--src/signal/sigaction.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index ab23a6f2..6eca06f1 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -17,10 +17,6 @@ void __get_handler_set(sigset_t *set)
int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
{
struct k_sigaction ksa, ksa_old;
- if (sig >= (unsigned)_NSIG) {
- errno = EINVAL;
- return -1;
- }
if (sa) {
if ((uintptr_t)sa->sa_handler > 1UL) {
a_or_l(handler_set+(sig-1)/(8*sizeof(long)),
@@ -57,7 +53,7 @@ int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigact
int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
{
- if (sig-32U < 3) {
+ if (sig-32U < 3 || sig-1U >= _NSIG-1) {
errno = EINVAL;
return -1;
}