From 71b3a63b641716165f664cf112be0673a122cea0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 22 Nov 2017 21:30:24 +0100 Subject: librt: fix broken posix_spawn Fix iteration over signals, synced with GNU C library code and pending patches. Issues found when running dhcpcd with hook scripts. (exit status 127) Reported-By: kapeka --- libc/sysdeps/linux/common/internal-signals.h | 79 ++++++++++++++++++++ libpthread/nptl/pthreadP.h | 3 +- .../nptl/sysdeps/unix/sysv/linux/nptl-signals.h | 84 ---------------------- libpthread/nptl/sysdeps/unix/sysv/linux/raise.c | 3 +- librt/spawn.c | 32 +++++++-- 5 files changed, 107 insertions(+), 94 deletions(-) create mode 100644 libc/sysdeps/linux/common/internal-signals.h delete mode 100644 libpthread/nptl/sysdeps/unix/sysv/linux/nptl-signals.h diff --git a/libc/sysdeps/linux/common/internal-signals.h b/libc/sysdeps/linux/common/internal-signals.h new file mode 100644 index 000000000..65e8de34b --- /dev/null +++ b/libc/sysdeps/linux/common/internal-signals.h @@ -0,0 +1,79 @@ +/* Copyright (C) 2014-2017 Free Software Foundation, Inc. + + 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 + . */ + +#include + +/* The signal used for asynchronous cancelation. */ +#define SIGCANCEL __SIGRTMIN + +/* Signal needed for the kernel-supported POSIX timer implementation. + We can reuse the cancellation signal since we can distinguish + cancellation from timer expirations. */ +#define SIGTIMER SIGCANCEL + +/* Signal used to implement the setuid et.al. functions. */ +#define SIGSETXID (__SIGRTMIN + 1) + +/* Return if sig is used internally. */ +static inline int +__is_internal_signal (int sig) +{ + return (sig == SIGCANCEL) || (sig == SIGTIMER) || (sig == SIGSETXID); +} + +/* Remove internal signal from the mask. */ +static inline void +__clear_internal_signals (sigset_t *set) +{ + __sigdelset (set, SIGCANCEL); + __sigdelset (set, SIGTIMER); + __sigdelset (set, SIGSETXID); +} + +#define SIGALL_SET \ + ((__sigset_t) { .__val = {[0 ... _SIGSET_NWORDS-1 ] = -1 } }) + +/* Block all signals, including internal ones. */ +static inline int +__libc_signal_block_all (sigset_t *set) +{ + INTERNAL_SYSCALL_DECL (err); + return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_BLOCK, &SIGALL_SET, + set, _NSIG / 8); +} + +/* Block all application signals (excluding internal ones). */ +static inline int +__libc_signal_block_app (sigset_t *set) +{ + sigset_t allset = SIGALL_SET; + __clear_internal_signals (&allset); + INTERNAL_SYSCALL_DECL (err); + return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_BLOCK, &allset, set, + _NSIG / 8); +} + +/* Restore current process signal mask. */ +static inline int +__libc_signal_restore_set (const sigset_t *set) +{ + INTERNAL_SYSCALL_DECL (err); + return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, set, NULL, + _NSIG / 8); +} + +/* Used to communicate with signal handler. */ +extern struct xid_command *__xidcmd attribute_hidden; diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h index 4707f6548..13205512a 100644 --- a/libpthread/nptl/pthreadP.h +++ b/libpthread/nptl/pthreadP.h @@ -1,5 +1,4 @@ /* Copyright (C) 2002-2007, 2009 Free Software Foundation, Inc. - This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. The GNU C Library is free software; you can redistribute it and/or @@ -31,7 +30,7 @@ #include #include #include -#include +#include /* Atomic operations on TLS memory. */ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/nptl-signals.h b/libpthread/nptl/sysdeps/unix/sysv/linux/nptl-signals.h deleted file mode 100644 index 43aa1a939..000000000 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/nptl-signals.h +++ /dev/null @@ -1,84 +0,0 @@ -/* Special use of signals in NPTL internals. Linux version. - Copyright (C) 2014-2017 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 - . */ - -#include - -/* The signal used for asynchronous cancelation. */ -#define SIGCANCEL __SIGRTMIN - - -/* Signal needed for the kernel-supported POSIX timer implementation. - We can reuse the cancellation signal since we can distinguish - cancellation from timer expirations. */ -#define SIGTIMER SIGCANCEL - - -/* Signal used to implement the setuid et.al. functions. */ -#define SIGSETXID (__SIGRTMIN + 1) - - -/* Return is sig is used internally. */ -static inline int -__nptl_is_internal_signal (int sig) -{ - return (sig == SIGCANCEL) || (sig == SIGTIMER) || (sig == SIGSETXID); -} - -/* Remove internal glibc signal from the mask. */ -static inline void -__nptl_clear_internal_signals (sigset_t *set) -{ - __sigdelset (set, SIGCANCEL); - __sigdelset (set, SIGTIMER); - __sigdelset (set, SIGSETXID); -} - -#define SIGALL_SET \ - ((__sigset_t) { .__val = {[0 ... _SIGSET_NWORDS-1 ] = -1 } }) - -/* Block all signals, including internal glibc ones. */ -static inline int -__libc_signal_block_all (sigset_t *set) -{ - INTERNAL_SYSCALL_DECL (err); - return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_BLOCK, &SIGALL_SET, - set, _NSIG / 8); -} - -/* Block all application signals (excluding internal glibc ones). */ -static inline int -__libc_signal_block_app (sigset_t *set) -{ - sigset_t allset = SIGALL_SET; - __nptl_clear_internal_signals (&allset); - INTERNAL_SYSCALL_DECL (err); - return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_BLOCK, &allset, set, - _NSIG / 8); -} - -/* Restore current process signal mask. */ -static inline int -__libc_signal_restore_set (const sigset_t *set) -{ - INTERNAL_SYSCALL_DECL (err); - return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, set, NULL, - _NSIG / 8); -} - -/* Used to communicate with signal handler. */ -extern struct xid_command *__xidcmd attribute_hidden; diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c b/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c index f74cd0be3..c0f6e277b 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c @@ -1,5 +1,4 @@ /* Copyright (C) 2002-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. The GNU C Library is free software; you can redistribute it and/or @@ -20,7 +19,7 @@ #include #include #include -#include +#include int raise (int sig) diff --git a/librt/spawn.c b/librt/spawn.c index 25e3994e1..a2b8e061b 100644 --- a/librt/spawn.c +++ b/librt/spawn.c @@ -25,6 +25,7 @@ #include #include +#include #include #include "spawn_int.h" @@ -153,13 +154,32 @@ __spawni(pid_t *pid, const char *file, int sig; memset(&sa, 0, sizeof(sa)); - sa.sa_handler = SIG_DFL; - for (sig = 1; sig <= _NSIG; ++sig) { - if (sigismember(&attrp->__sd, sig)) { - if (sigaction(sig, &sa, NULL) != 0) - goto error; - } + sigset_t hset; + sigprocmask (SIG_BLOCK, 0, &hset); + + for (int sig = 1; sig < _NSIG; ++sig) { + if ((flags & POSIX_SPAWN_SETSIGDEF) + && sigismember (&attrp->__sd, sig)) + { + sa.sa_handler = SIG_DFL; + } + else if (sigismember (&hset, sig)) + { + if (__is_internal_signal (sig)) + sa.sa_handler = SIG_IGN; + else + { + __libc_sigaction (sig, 0, &sa); + if (sa.sa_handler == SIG_IGN) + continue; + sa.sa_handler = SIG_DFL; + } + } + else + continue; + + __libc_sigaction (sig, &sa, 0); } } -- cgit v1.2.3