diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/internal-signals.h | 31 | ||||
| -rw-r--r-- | sysdeps/posix/signal.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/internal-signals.h | 63 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/internal-sigset.h | 105 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/spawni.c | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/timer_routines.c | 2 |
7 files changed, 152 insertions, 67 deletions
diff --git a/sysdeps/generic/internal-signals.h b/sysdeps/generic/internal-signals.h index 6121c117ab..0c8f67f1a2 100644 --- a/sysdeps/generic/internal-signals.h +++ b/sysdeps/generic/internal-signals.h @@ -29,39 +29,20 @@ #define RESERVED_SIGRT 0 static inline bool -__is_internal_signal (int sig) +is_internal_signal (int sig) { return false; } static inline void -__clear_internal_signals (sigset_t *set) +clear_internal_signals (sigset_t *set) { } -static inline void -__libc_signal_block_all (sigset_t *set) -{ - sigset_t allset; - __sigfillset (&allset); - __sigprocmask (SIG_BLOCK, &allset, set); -} - -static inline void -__libc_signal_block_app (sigset_t *set) -{ - sigset_t allset; - __sigfillset (&allset); - __clear_internal_signals (&allset); - __sigprocmask (SIG_BLOCK, &allset, set); -} - -/* Restore current process signal mask. */ -static inline void -__libc_signal_restore_set (const sigset_t *set) -{ - __sigprocmask (SIG_SETMASK, set, NULL); -} +typedef sigset_t internal_sigset_t; +#define internal_sigemptyset(__s) sigemptyset (__s) +#define internal_sigaddset(__s, __i) sigaddset (__s, __i) +#define internal_sigprocmask(__h, __s, __o) sigprocmask (__h, __s, __o) #endif /* __INTERNAL_SIGNALS_H */ diff --git a/sysdeps/posix/signal.c b/sysdeps/posix/signal.c index 8f17b4278d..88c3757126 100644 --- a/sysdeps/posix/signal.c +++ b/sysdeps/posix/signal.c @@ -32,7 +32,7 @@ __bsd_signal (int sig, __sighandler_t handler) /* Check signal extents to protect __sigismember. */ if (handler == SIG_ERR || sig < 1 || sig >= NSIG - || __is_internal_signal (sig)) + || is_internal_signal (sig)) { __set_errno (EINVAL); return SIG_ERR; diff --git a/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c b/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c index a59ad78036..a53ae79965 100644 --- a/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c +++ b/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c @@ -34,7 +34,7 @@ __libc_unwind_longjmp (sigjmp_buf env, int val) if (env[0].__mask_was_saved) /* Restore the saved signal mask. */ - __libc_signal_restore_set (&env[0].__saved_mask); + __sigprocmask (SIG_SETMASK, &env[0].__saved_mask, NULL); /* Call the machine-dependent function to restore machine state. */ __sigstack_longjmp (env[0].__jmpbuf, val ?: 1); diff --git a/sysdeps/unix/sysv/linux/internal-signals.h b/sysdeps/unix/sysv/linux/internal-signals.h index f9efb6a159..b624a080f7 100644 --- a/sysdeps/unix/sysv/linux/internal-signals.h +++ b/sysdeps/unix/sysv/linux/internal-signals.h @@ -19,10 +19,11 @@ #ifndef __INTERNAL_SIGNALS_H # define __INTERNAL_SIGNALS_H +#include <internal-sigset.h> +#include <limits.h> #include <signal.h> #include <sigsetops.h> #include <stdbool.h> -#include <limits.h> #include <stddef.h> #include <sysdep.h> @@ -47,67 +48,63 @@ /* Return is sig is used internally. */ static inline bool -__is_internal_signal (int sig) +is_internal_signal (int sig) { return (sig == SIGCANCEL) || (sig == SIGSETXID); } /* Remove internal glibc signal from the mask. */ static inline void -__clear_internal_signals (sigset_t *set) +clear_internal_signals (sigset_t *set) { __sigdelset (set, SIGCANCEL); __sigdelset (set, SIGSETXID); } -static const sigset_t sigall_set = { - .__val = {[0 ... _SIGSET_NWORDS-1 ] = -1 } -}; - -static const sigset_t sigtimer_set = { - .__val = { [0] = __sigmask (SIGTIMER), - [1 ... _SIGSET_NWORDS-1] = 0 } +static const internal_sigset_t sigall_set = { + .__val = {[0 ... __NSIG_WORDS-1 ] = -1 } }; -/* Block all signals, including internal glibc ones. */ -static inline void -__libc_signal_block_all (sigset_t *set) +/* Obtain and change blocked signals, including internal glibc ones. */ +static inline int +internal_sigprocmask (int how, const internal_sigset_t *set, + internal_sigset_t *oldset) { - INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigall_set, set, - __NSIG_BYTES); + return INTERNAL_SYSCALL_CALL (rt_sigprocmask, how, set, oldset, + __NSIG_BYTES); } -/* Block all application signals (excluding internal glibc ones). */ +/* Block all signals, including internal glibc ones. */ static inline void -__libc_signal_block_app (sigset_t *set) +internal_signal_block_all (internal_sigset_t *oset) { - sigset_t allset = sigall_set; - __clear_internal_signals (&allset); - INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &allset, set, + INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigall_set, oset, __NSIG_BYTES); } -/* Block only SIGTIMER and return the previous set on SET. */ +/* Restore current process signal mask. */ static inline void -__libc_signal_block_sigtimer (sigset_t *set) +internal_signal_restore_set (const internal_sigset_t *set) { - INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigtimer_set, set, + INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, set, NULL, __NSIG_BYTES); } -/* Unblock only SIGTIMER and return the previous set on SET. */ -static inline void -__libc_signal_unblock_sigtimer (sigset_t *set) -{ - INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_UNBLOCK, &sigtimer_set, set, - __NSIG_BYTES); -} -/* Restore current process signal mask. */ +/* It is used on timer_create code directly on sigwaitinfo call, so it can not + use the internal_sigset_t definitions. */ +static const sigset_t sigtimer_set = { + .__val = { [0] = __sigmask (SIGTIMER), + [1 ... _SIGSET_NWORDS-1] = 0 + } +}; + +/* Unblock only SIGTIMER. */ static inline void -__libc_signal_restore_set (const sigset_t *set) +signal_unblock_sigtimer (void) { - INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, set, NULL, + INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_UNBLOCK, &sigtimer_set, NULL, __NSIG_BYTES); } + #endif diff --git a/sysdeps/unix/sysv/linux/internal-sigset.h b/sysdeps/unix/sysv/linux/internal-sigset.h new file mode 100644 index 0000000000..46939ddf15 --- /dev/null +++ b/sysdeps/unix/sysv/linux/internal-sigset.h @@ -0,0 +1,105 @@ +/* Internal sigset_t definition. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +#ifndef _INTERNAL_SIGSET_H +#define _INTERNAL_SIGSET_H + +#include <sigsetops.h> + +typedef struct +{ + unsigned long int __val[__NSIG_WORDS]; +} internal_sigset_t; + +static inline void +internal_sigset_from_sigset (internal_sigset_t *iset, const sigset_t *set) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + iset->__val[cnt] = set->__val[cnt]; +} + +static inline void +internal_sigemptyset (internal_sigset_t *set) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + set->__val[cnt] = 0; +} + +static inline void +internal_sigfillset (internal_sigset_t *set) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + set->__val[cnt] = ~0UL; +} + +static inline int +internal_sigisemptyset (const internal_sigset_t *set) +{ + int cnt = __NSIG_WORDS; + int ret = set->__val[--cnt]; + while (ret == 0 && --cnt >= 0) + ret = set->__val[cnt]; + return ret == 0; +} + +static inline void +internal_sigandset (internal_sigset_t *dest, const internal_sigset_t *left, + const internal_sigset_t *right) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + dest->__val[cnt] = left->__val[cnt] & right->__val[cnt]; +} + +static inline void +internal_sigorset (internal_sigset_t *dest, const internal_sigset_t *left, + const internal_sigset_t *right) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + dest->__val[cnt] = left->__val[cnt] | right->__val[cnt]; +} + +static inline int +internal_sigismember (const internal_sigset_t *set, int sig) +{ + unsigned long int mask = __sigmask (sig); + unsigned long int word = __sigword (sig); + return set->__val[word] & mask ? 1 : 0; +} + +static inline void +internal_sigaddset (internal_sigset_t *set, int sig) +{ + unsigned long int mask = __sigmask (sig); + unsigned long int word = __sigword (sig); + set->__val[word] |= mask; +} + +static inline void +internal_sigdelset (internal_sigset_t *set, int sig) +{ + unsigned long int mask = __sigmask (sig); + unsigned long int word = __sigword (sig); + set->__val[word] &= ~mask; +} + +#endif /* _INTERNAL_SIGSET_H */ diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index d6f5ca89cd..ee843a2247 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -57,7 +57,7 @@ struct posix_spawn_args { - sigset_t oldmask; + internal_sigset_t oldmask; const char *file; int (*exec) (const char *, char *const *, char *const *); const posix_spawn_file_actions_t *fa; @@ -124,7 +124,7 @@ __spawni_child (void *arguments) } else if (__sigismember (&hset, sig)) { - if (__is_internal_signal (sig)) + if (is_internal_signal (sig)) sa.sa_handler = SIG_IGN; else { @@ -284,8 +284,10 @@ __spawni_child (void *arguments) /* Set the initial signal mask of the child if POSIX_SPAWN_SETSIGMASK is set, otherwise restore the previous one. */ - __sigprocmask (SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK) - ? &attr->__ss : &args->oldmask, 0); + if (attr->__flags & POSIX_SPAWN_SETSIGMASK) + __sigprocmask (SIG_SETMASK, &attr->__ss, NULL); + else + internal_sigprocmask (SIG_SETMASK, &args->oldmask, NULL); args->exec (args->file, args->argv, args->envp); @@ -368,7 +370,7 @@ __spawnix (pid_t * pid, const char *file, args.envp = envp; args.xflags = xflags; - __libc_signal_block_all (&args.oldmask); + internal_signal_block_all (&args.oldmask); /* The clone flags used will create a new child that will run in the same memory space (CLONE_VM) and the execution of calling thread will be @@ -416,7 +418,7 @@ __spawnix (pid_t * pid, const char *file, if ((ec == 0) && (pid != NULL)) *pid = new_pid; - __libc_signal_restore_set (&args.oldmask); + internal_signal_restore_set (&args.oldmask); __pthread_setcancelstate (state, NULL); diff --git a/sysdeps/unix/sysv/linux/timer_routines.c b/sysdeps/unix/sysv/linux/timer_routines.c index 8f0a2f635d..7433f7f559 100644 --- a/sysdeps/unix/sysv/linux/timer_routines.c +++ b/sysdeps/unix/sysv/linux/timer_routines.c @@ -41,7 +41,7 @@ struct thread_start_data static void * timer_sigev_thread (void *arg) { - __libc_signal_unblock_sigtimer (NULL); + signal_unblock_sigtimer (); struct thread_start_data *td = (struct thread_start_data *) arg; void (*thrfunc) (sigval_t) = td->thrfunc; |