From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 11A39384B0C1; Tue, 21 Apr 2020 18:12:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 11A39384B0C1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] linux: Use pthread_sigmask on sigprocmask X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 34d49f120df2787788acfdf86769277a1a7ebccb X-Git-Newrev: 2f6fa80147f0cf74c0d411a0e07c5655deb436b3 Message-Id: <20200421181217.11A39384B0C1@sourceware.org> Date: Tue, 21 Apr 2020 18:12:17 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Apr 2020 18:12:17 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2f6fa80147f0cf74c0d411a0e07c5655deb436b3 commit 2f6fa80147f0cf74c0d411a0e07c5655deb436b3 Author: Adhemerval Zanella Date: Wed Mar 11 15:21:59 2020 -0300 linux: Use pthread_sigmask on sigprocmask With pthread_sigmask on libc.so, it allows implement sigprocmask on top of pthread_sigmask. Checked on x86_64-linux-gnu. Diff: --- nptl/pthreadP.h | 2 ++ nptl/pthread_sigmask.c | 1 + sysdeps/unix/sysv/linux/sigprocmask.c | 20 +++++--------------- sysdeps/unix/sysv/linux/test-errno-linux.c | 19 +++++++++++++++++++ 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 06fb0d74c5..c4e72f57a9 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -482,6 +482,8 @@ extern void __pthread_testcancel (void); extern int __pthread_clockjoin_ex (pthread_t, void **, clockid_t, const struct timespec *, bool) attribute_hidden; +extern int __pthread_sigmask (int, const sigset_t *, sigset_t *); +libc_hidden_proto (__pthread_sigmask); #if IS_IN (libpthread) diff --git a/nptl/pthread_sigmask.c b/nptl/pthread_sigmask.c index 035104453f..c6c6e83c08 100644 --- a/nptl/pthread_sigmask.c +++ b/nptl/pthread_sigmask.c @@ -46,6 +46,7 @@ __pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask) ? INTERNAL_SYSCALL_ERRNO (result) : 0); } +libc_hidden_def (__pthread_sigmask) versioned_symbol (libc, __pthread_sigmask, pthread_sigmask, GLIBC_2_32); #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_32) diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c index eb9e4d5e83..59bf6fd660 100644 --- a/sysdeps/unix/sysv/linux/sigprocmask.c +++ b/sysdeps/unix/sysv/linux/sigprocmask.c @@ -22,21 +22,11 @@ int __sigprocmask (int how, const sigset_t *set, sigset_t *oset) { - sigset_t local_newmask; - - /* The only thing we have to make sure here is that SIGCANCEL and - SIGSETXID are not blocked. */ - if (set != NULL - && __glibc_unlikely (__sigismember (set, SIGCANCEL) - || __glibc_unlikely (__sigismember (set, SIGSETXID)))) - { - local_newmask = *set; - __sigdelset (&local_newmask, SIGCANCEL); - __sigdelset (&local_newmask, SIGSETXID); - set = &local_newmask; - } - - return INLINE_SYSCALL_CALL (rt_sigprocmask, how, set, oset, _NSIG / 8); + int result = __pthread_sigmask (how, set, oset); + if (result == 0) + return 0; + __set_errno (result); + return -1; } libc_hidden_def (__sigprocmask) weak_alias (__sigprocmask, sigprocmask) diff --git a/sysdeps/unix/sysv/linux/test-errno-linux.c b/sysdeps/unix/sysv/linux/test-errno-linux.c index b748f8f2a0..838ccf026f 100644 --- a/sysdeps/unix/sysv/linux/test-errno-linux.c +++ b/sysdeps/unix/sysv/linux/test-errno-linux.c @@ -120,6 +120,17 @@ check_error_in_list (int code, int *codes, size_t count) #define test_wrp2(experr, syscall, ...) \ test_wrp_rv(int, "%d", LIST_FORWARD (experr), syscall, __VA_ARGS__) +static int +invalid_sigprocmask_how (void) +{ + int n = 0; + const int how[] = { SIG_BLOCK, SIG_UNBLOCK, SIG_SETMASK }; + for (int i = 0; i < array_length (how); i++) + if (how[i] == n) + n++; + return n; +} + static int do_test (void) { @@ -133,10 +144,13 @@ do_test (void) struct sched_param sch_param; struct timespec ts; struct timeval tv; + sigset_t sigs; unsigned char vec[16]; ss.ss_flags = ~SS_DISABLE; ts.tv_sec = -1; + sigemptyset (&sigs); + int fails = 0; fails |= test_wrp (EINVAL, epoll_create, -1); fails |= test_wrp (EINVAL, epoll_create1, EPOLL_CLOEXEC + 1); @@ -175,6 +189,11 @@ do_test (void) fails |= test_wrp (EBADF, sendfile, -1, -1, &off, 0); fails |= test_wrp (EINVAL, sigaltstack, &ss, NULL); fails |= test_wrp (ECHILD, wait4, -1, &status, 0, NULL); + /* Austin Group issue #1132 states EINVAL should be returned for invalid + how argument iff the new set mask is non-null. And Linux follows the + standard on this regard. */ + fails |= test_wrp (EINVAL, sigprocmask, invalid_sigprocmask_how (), &sigs, + NULL); return fails; }