Libc-1272.250.1.tar.gz

[apple/libc.git] / sys / sigaction.c

diff --git a/sys/sigaction.c b/sys/sigaction.c
index 2e9652cdfb7e7d5e568591d4232b6e5c4766923c..a81d20c7e2b09c696c5d26817cd30639f64861e1 100644 (file)
--- 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@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -20,44 +20,37 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */

-/*
- * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved
- *
- *     @(#)sigaction.c 1.0
- */

 
 

+#include <CrashReporterClient.h>
+#include <stdlib.h>
+#include <stdio.h>

 #include <unistd.h>
 #include <signal.h>
 #include <sys/signal.h>
 #include <errno.h>
 
 #include <unistd.h>
 #include <signal.h>
 #include <sys/signal.h>
 #include <errno.h>
 

-/*
- *     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.
- */
-extern int __sigaction (int, struct __sigaction * __restrict, struct sigaction * __restrict);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes"
+
+extern int __platform_sigaction (int sig,
+               const struct sigaction * __restrict nsv,
+               struct sigaction * __restrict osv);

 
 int
 
 int

-sigaction (int sig, const struct sigaction * __restrict nsv, struct sigaction * __restrict osv)
+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;
-       }
-       return __sigaction(sig, sap, osv);
+#endif
+       return ret;

 }
 
 // XXX
 }
 
 // XXX


@@ -73,3 +66,4 @@ _sigaction_nobind (sig, nsv, osv)
 }
 #endif
 
 }
 #endif
 

+#pragma clang diagnostic pop