|
@@ -20,14 +20,6 @@ volatile int __eintr_valid_flag;
|
|
|
int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
|
|
|
{
|
|
|
struct k_sigaction ksa, ksa_old;
|
|
|
- unsigned long set[_NSIG/(8*sizeof(long))];
|
|
|
- /* Doing anything with the disposition of SIGABRT requires a lock,
|
|
|
- * so that it cannot be changed while abort is terminating the
|
|
|
- * process and so any change made by abort can't be observed. */
|
|
|
- if (sig == SIGABRT) {
|
|
|
- __block_all_sigs(&set);
|
|
|
- LOCK(__abort_lock);
|
|
|
- }
|
|
|
if (sa) {
|
|
|
if ((uintptr_t)sa->sa_handler > 1UL) {
|
|
|
a_or_l(handler_set+(sig-1)/(8*sizeof(long)),
|
|
@@ -57,10 +49,6 @@ int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigact
|
|
|
memcpy(&ksa.mask, &sa->sa_mask, _NSIG/8);
|
|
|
}
|
|
|
int r = __syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, _NSIG/8);
|
|
|
- if (sig == SIGABRT) {
|
|
|
- UNLOCK(__abort_lock);
|
|
|
- __restore_sigs(&set);
|
|
|
- }
|
|
|
if (old && !r) {
|
|
|
old->sa_handler = ksa_old.handler;
|
|
|
old->sa_flags = ksa_old.flags;
|
|
@@ -71,11 +59,26 @@ 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)
|
|
|
{
|
|
|
+ unsigned long set[_NSIG/(8*sizeof(long))];
|
|
|
+
|
|
|
if (sig-32U < 3 || sig-1U >= _NSIG-1) {
|
|
|
errno = EINVAL;
|
|
|
return -1;
|
|
|
}
|
|
|
- return __libc_sigaction(sig, sa, old);
|
|
|
+
|
|
|
+ /* Doing anything with the disposition of SIGABRT requires a lock,
|
|
|
+ * so that it cannot be changed while abort is terminating the
|
|
|
+ * process and so any change made by abort can't be observed. */
|
|
|
+ if (sig == SIGABRT) {
|
|
|
+ __block_all_sigs(&set);
|
|
|
+ LOCK(__abort_lock);
|
|
|
+ }
|
|
|
+ int r = __libc_sigaction(sig, sa, old);
|
|
|
+ if (sig == SIGABRT) {
|
|
|
+ UNLOCK(__abort_lock);
|
|
|
+ __restore_sigs(&set);
|
|
|
+ }
|
|
|
+ return r;
|
|
|
}
|
|
|
|
|
|
weak_alias(__sigaction, sigaction);
|