X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/51631861ddb16afcfcf748cee26c14481549065e..70ad1dc8a19d6edd9b97aa81f32cfd65758ae97d:/sys/sigaction.c diff --git a/sys/sigaction.c b/sys/sigaction.c index dad8bc4..a81d20c 100644 --- a/sys/sigaction.c +++ b/sys/sigaction.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999 Apple Computer, Inc. All rights reserved. + * Copyright (c) 1999-2017 Apple Computer, Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * @@ -20,70 +20,37 @@ * * @APPLE_LICENSE_HEADER_END@ */ -/* - * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved - * - * @(#)sigaction.c 1.0 - */ -#include +#include +#include +#include #include #include #include #include -/* - * Intercept the sigaction syscall and use our signal trampoline - * as the signal handler instead. The code here is derived - * from sigvec in sys/kern_sig.c. - */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wstrict-prototypes" -#if defined(__DYNAMIC__) -extern int __in_sigtramp; -#endif +extern int __platform_sigaction (int sig, + const struct sigaction * __restrict nsv, + struct sigaction * __restrict osv); -static int -sigaction__ (sig, nsv, osv, bind) - int sig; - register struct sigaction *nsv, *osv; - int bind; +int +sigaction (int sig, const struct sigaction * __restrict nsv, + struct sigaction * __restrict osv) { - extern void _sigtramp(); - struct __sigaction sa; - struct __sigaction *sap; - - if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP) { - errno = EINVAL; - return (-1); + int ret = __platform_sigaction(sig, nsv, osv); +#ifdef FEATURE_SIGNAL_RESTRICTION + // Note: The "sig != 0" here is to force the compiler to maintain that "sig" + // is live, and in a register, after __sigaction so it is visible in the + // crashing register state. + if (ret == -1 && errno == ENOTSUP && sig != 0) { + CRSetCrashLogMessage("sigaction on fatal signals is not supported"); + __builtin_trap(); } - sap = (struct __sigaction *)0; - if (nsv) { - sa.sa_handler = nsv->sa_handler; - sa.sa_tramp = _sigtramp; - sa.sa_mask = nsv->sa_mask; - sa.sa_flags = nsv->sa_flags; - sap = &sa; - if (nsv->sa_handler != (void (*)())SIG_DFL && nsv->sa_handler != (void (*)())SIG_IGN) { -#ifdef __DYNAMIC__ - if (bind && (__in_sigtramp == 0)) // XXX - _dyld_bind_fully_image_containing_address(nsv->sa_handler); #endif - } - } - if (syscall (SYS_sigaction, sig, sap, osv) < 0) { - return (-1); - } - return (0); -} - - -int -sigaction (sig, nsv, osv) - int sig; - register const struct sigaction *nsv; - register struct sigaction *osv; -{ - return sigaction__(sig, nsv, osv, 1); + return ret; } // XXX @@ -95,7 +62,8 @@ _sigaction_nobind (sig, nsv, osv) register const struct sigaction *nsv; register struct sigaction *osv; { - return sigaction__(sig, nsv, osv, 0); + return sigaction(sig, nsv, osv); } #endif +#pragma clang diagnostic pop