From patchwork Tue Dec 31 19:31:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 182687 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp7927882ild; Tue, 31 Dec 2019 11:31:58 -0800 (PST) X-Google-Smtp-Source: APXvYqzAA61F/+V4fRXn1DSmhOHkeYZP/lDttZ557PR95PLHSpJOLgeMdUuveHozAbWx/v/koFK/ X-Received: by 2002:adf:fd84:: with SMTP id d4mr73284142wrr.211.1577820717887; Tue, 31 Dec 2019 11:31:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577820717; cv=none; d=google.com; s=arc-20160816; b=iZeJRV9aDKbKEdpf0bHZLZde0BEN8pNpbBPInTfRR4Y9p9wdc7g4vy2ui2rmYKyPxv D4rmDoQFQF4njgR/cwHgKMWbynL3yB3XTWQVvfOcJWebfAiSa63XbU3xUJBzxnRXHnij gxMslK19Sva1HX5BkcGXm/7/FyG5rdlmAzRLG8nmvp6HP3Kam2voH0XRGnYxpFEQR4IY V32njBaupS7ErufCAlNPlJn85hLeVXrZxWN914vhF2jKm2AESeVlA5g/xac9qFtYds9N wd2pBu5wMSKNhnIG8kENaTuEirQO78g0bCzoVv97DSq1EYfJXlTQd96zxhzXJycRxBKI L+uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=vV9gg4i+w2bhiXuLcCxHGqalMFZwaJvW6hqy67zMHLE=; b=sZQUIL0NGfjm9vrjlANp9KRkXZAjHnTAXdqS95ha2YPperSsoV4RyfG/N5DtIFIrno 1cYsukQRqBVbqBkw0qxQ3rO5d9Z0Q4ZO7HrF3i9ammiWAOANkeKwTXQJPkiF4+sA5lZX zpxxynGT4TysiRN2k4C3HXMEdwK4dunOreHYRHA4+2jdWLBfvmMSzM3F2MYg8CbUjGVu ++D1lC/4eCcVG70lF/0sC13bVGNYbcYu5J5gKLpXGBq9B06ykRIH0mdCkOMvs5LprhBO cgS52tK4lnHgkeNkNVu/p9lqps1FDrHhiyd7e4DN6sMQsbvfKDYgsyE9qSccCeOKu+fk aEjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=gEcpPX+L; dkim=pass header.i=@linaro.org header.s=google header.b=Bfntbe6C; spf=pass (google.com: domain of libc-alpha-return-108391-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108391-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id by1si30871788edb.198.2019.12.31.11.31.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2019 11:31:57 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-108391-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=gEcpPX+L; dkim=pass header.i=@linaro.org header.s=google header.b=Bfntbe6C; spf=pass (google.com: domain of libc-alpha-return-108391-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108391-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=PF1Q4jc2Wrav3JDCqwCsW/qTvgKJ5gT m/oTclb74yBr9VKnOggIQCf4mtXdWqGS5X5WrGrkNHgOe0UrOMn7h4taV3l0mayt 3eJ7zpn4xomumHankTG7vyJMEmOm4n30mg3mwD46jfVus71OWKKkNEITkDnJ8mlR OryPaqwIGn+k= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=EP2+V+nfKouH9KLDMHFsx0nGBxI=; b=gEcpP X+LRanmdkIpJHEVYnY2oy1P+sHUT9iUh9wNTZlU2UJcs6yrvszR5J7uRmH0dNHRq XZOKpyTzTwjYyzq5SDteDyPi3I2dcvJv9Kdcrb+8OfAIlft4wBo8pmmje2zSOwhQ onIlZYWtJOSR03wGTxEoFjpnBJCi9xrSGVVDmI= Received: (qmail 129675 invoked by alias); 31 Dec 2019 19:31:41 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 129613 invoked by uid 89); 31 Dec 2019 19:31:40 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=1000000, canceled, opens, xxx X-HELO: mail-pg1-f177.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=vV9gg4i+w2bhiXuLcCxHGqalMFZwaJvW6hqy67zMHLE=; b=Bfntbe6CvGey2Ypwauk35zRnC/kPDqUvzzeBsKkZDIjFYGu4CwUxWYUviItATH8QD6 MNml+kwW7lkoDh9mDqokD1CkZlK6SOm0U/TMXwHwEGYcUTBO9tvxxE1DGdan/yrYoPbO zkzbkflcYMeb0olBpdN5QzfUEJ/EG4CMJBbj9tyGOGjR9sPlNGPepaaJQCBtuStGSsGx Dg6sujxr7iMmIWIB8wHMJjQeBPGLqmCydwyCcWZy2mJ131n63tj+VyWyHVUcEVddF+z1 aOr4Jawo3QZt+RL6F0qchuFgDVoTIh0wCuhnymu41CB6HCFP68rmoH1RvfoVdBhH5Y40 WK3Q== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 2/2] Block all signals on timer_create thread (BZ#10815) Date: Tue, 31 Dec 2019 16:31:29 -0300 Message-Id: <20191231193129.2590-2-adhemerval.zanella@linaro.org> In-Reply-To: <20191231193129.2590-1-adhemerval.zanella@linaro.org> References: <20191231193129.2590-1-adhemerval.zanella@linaro.org> Changes from previous version: - Use xpthread on tst-timer-sigmask. - It does not block SIGCANCEL and it adds tst-cancel28.c to check if the created thread is cancellable. -- The behavior of the signal mask on threads created by timer_create for SIGEV_THREAD timers are implementation-defined and glibc explicit unblocks all signals before calling the user-defined function. This behavior, although not incorrect standard-wise, opens a race if a program using a blocked rt-signal plus sigwaitinfo (and without an installed signal handler for the rt-signal) receives a signal while executing the used-defined function for SIGEV_THREAD. A better alternative discussed in bug report is to rather block all signals (besides the internal ones not available to application usage). This patch fixes this issue by only unblocking SIGSETXID (used on set*uid function) and SIGCANCEL (used for thread cancellation). Checked on x86_64-linux-gnu and i686-linux-gnu. --- nptl/Makefile | 5 +- nptl/tst-cancel28.c | 80 ++++++++++++++++++ rt/Makefile | 7 +- rt/tst-timer-sigmask.c | 85 +++++++++++++++++++ sysdeps/unix/sysv/linux/internal-signals.h | 20 +++++ sysdeps/unix/sysv/linux/timer_routines.c | 96 ++++++++-------------- 6 files changed, 227 insertions(+), 66 deletions(-) create mode 100644 nptl/tst-cancel28.c create mode 100644 rt/tst-timer-sigmask.c -- 2.17.1 diff --git a/nptl/Makefile b/nptl/Makefile index 4a57213ddb..ca4d14d541 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -286,7 +286,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \ tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \ tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel19 tst-cancel20 \ tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 \ - tst-cancel26 tst-cancel27 \ + tst-cancel26 tst-cancel27 tst-cancel28 \ tst-cancel-self tst-cancel-self-cancelstate \ tst-cancel-self-canceltype tst-cancel-self-testcancel \ tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 tst-cleanup4 \ @@ -600,6 +600,9 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \ $(BASH) $< $(common-objpfx) '$(test-via-rtld-prefix)' \ '$(test-wrapper-env)' '$(run-program-env)' > $@; \ $(evaluate-test) +$(objpfx)tst-cancel28: $(common-objpfx)rt/librt.so +else +$(objpfx)tst-cancel28: $(common-objpfx)rt/librt.a endif $(objpfx)tst-join7: $(libdl) $(shared-thread-library) diff --git a/nptl/tst-cancel28.c b/nptl/tst-cancel28.c new file mode 100644 index 0000000000..ad70aeb548 --- /dev/null +++ b/nptl/tst-cancel28.c @@ -0,0 +1,80 @@ +/* Check if the thread created by POSIX timer using SIGEV_THREAD is + cancellable. + Copyright (C) 2019 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 +#include +#include +#include +#include + +#include +#include +#include + +static pthread_barrier_t barrier; +static pthread_t timer_thread; + +static void +cl (void *arg) +{ + xpthread_barrier_wait (&barrier); +} + +static void +thread_handler (union sigval sv) +{ + timer_thread = pthread_self (); + + xpthread_barrier_wait (&barrier); + + pthread_cleanup_push (cl, NULL); + while (1) + clock_nanosleep (CLOCK_REALTIME, 0, &(struct timespec) { 1, 0 }, NULL); + pthread_cleanup_pop (0); +} + +static int +do_test (void) +{ + struct sigevent sev = { 0 }; + sev.sigev_notify = SIGEV_THREAD; + sev.sigev_notify_function = &thread_handler; + + timer_t timerid; + TEST_COMPARE (timer_create (CLOCK_REALTIME, &sev, &timerid), 0); + + xpthread_barrier_init (&barrier, NULL, 2); + + struct itimerspec trigger = { 0 }; + trigger.it_value.tv_nsec = 1000000; + TEST_COMPARE (timer_settime (timerid, 0, &trigger, NULL), 0); + + xpthread_barrier_wait (&barrier); + + xpthread_cancel (timer_thread); + + xpthread_barrier_init (&barrier, NULL, 2); + xpthread_barrier_wait (&barrier); + + return 0; +} + +/* A stall in cancellation is a regression. */ +#define TIMEOUT 5 +#include diff --git a/rt/Makefile b/rt/Makefile index 6c8365e0c0..a7a82879c7 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -47,6 +47,7 @@ tests := tst-shm tst-timer tst-timer2 \ tst-timer3 tst-timer4 tst-timer5 \ tst-cpuclock2 tst-cputimer1 tst-cputimer2 tst-cputimer3 \ tst-shm-cancel +tests-internal := tst-timer-sigmask extra-libs := librt extra-libs-others := $(extra-libs) @@ -63,9 +64,11 @@ LDFLAGS-rt.so = -Wl,--enable-new-dtags,-z,nodelete $(objpfx)librt.so: $(shared-thread-library) ifeq (yes,$(build-shared)) -$(addprefix $(objpfx),$(tests)): $(objpfx)librt.so $(shared-thread-library) +$(addprefix $(objpfx),$(tests) $(tests-internal)): \ + $(objpfx)librt.so $(shared-thread-library) else -$(addprefix $(objpfx),$(tests)): $(objpfx)librt.a $(static-thread-library) +$(addprefix $(objpfx),$(tests)) $(tests-internal): \ + $(objpfx)librt.a $(static-thread-library) endif tst-mqueue7-ARGS = -- $(host-test-program-cmd) diff --git a/rt/tst-timer-sigmask.c b/rt/tst-timer-sigmask.c new file mode 100644 index 0000000000..063004120a --- /dev/null +++ b/rt/tst-timer-sigmask.c @@ -0,0 +1,85 @@ +/* Check resulting signal mask from POSIX timer using SIGEV_THREAD. + Copyright (C) 2019 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 +#include +#include +#include + +#include +#include +#include + +#include + +static pthread_barrier_t barrier; +static bool thread_handler_failure = false; + +static void +thread_handler (union sigval sv) +{ + sigset_t ss; + sigprocmask (SIG_BLOCK, NULL, &ss); + if (test_verbose > 0) + printf ("%s: blocked signal mask = { ", __func__); + for (int sig = 1; sig < NSIG; sig++) + { +#ifdef __linux__ + /* POSIX timers threads created to handle SIGEV_THREAD block all + signals except SIGKILL, SIGSTOP and glibc internals one except + SIGTIMER. */ + if (!sigismember (&ss, sig) + && (sig != SIGSETXID && sig != SIGCANCEL + && sig != SIGKILL && sig != SIGSTOP)) + { + thread_handler_failure = true; + } +#endif + if (test_verbose && sigismember (&ss, sig)) + printf ("%d, ", sig); + } + if (test_verbose > 0) + printf ("}\n"); + + xpthread_barrier_wait (&barrier); +} + +static int +do_test (void) +{ + struct sigevent sev = { 0 }; + sev.sigev_notify = SIGEV_THREAD; + sev.sigev_notify_function = &thread_handler; + + timer_t timerid; + TEST_COMPARE (timer_create (CLOCK_REALTIME, &sev, &timerid), 0); + + xpthread_barrier_init (&barrier, NULL, 2); + + struct itimerspec trigger = { 0 }; + trigger.it_value.tv_nsec = 1000000; + TEST_COMPARE (timer_settime (timerid, 0, &trigger, NULL), 0); + + xpthread_barrier_wait (&barrier); + + TEST_COMPARE (thread_handler_failure, false); + + return 0; +} + +#include diff --git a/sysdeps/unix/sysv/linux/internal-signals.h b/sysdeps/unix/sysv/linux/internal-signals.h index 06d1d38b7f..df406ea522 100644 --- a/sysdeps/unix/sysv/linux/internal-signals.h +++ b/sysdeps/unix/sysv/linux/internal-signals.h @@ -65,6 +65,17 @@ static const sigset_t sigall_set = { .__val = {[0 ... _SIGSET_NWORDS-1 ] = -1 } }; +static const sigset_t sigtimer_set = { +#if ULONG_MAX == 0xffffffff + .__val = { [0] = 0, + [1] = __sigmask (SIGTIMER), + [2 ... _SIGSET_NWORDS-1] = 0 } +#else + .__val = { [0] = __sigmask (SIGTIMER), + [1 ... _SIGSET_NWORDS-1] = 0 } +#endif +}; + /* Block all signals, including internal glibc ones. */ static inline void __libc_signal_block_all (sigset_t *set) @@ -85,6 +96,15 @@ __libc_signal_block_app (sigset_t *set) _NSIG / 8); } +/* Block only the SIGTIMER set. */ +static inline void +__libc_signal_block_sigtimer (sigset_t *set) +{ + INTERNAL_SYSCALL_DECL (err); + INTERNAL_SYSCALL_CALL (rt_sigprocmask, err, SIG_BLOCK, &sigtimer_set, set, + _NSIG / 8); +} + /* Restore current process signal mask. */ static inline void __libc_signal_restore_set (const sigset_t *set) diff --git a/sysdeps/unix/sysv/linux/timer_routines.c b/sysdeps/unix/sysv/linux/timer_routines.c index 84213dd4f7..832cc9190a 100644 --- a/sysdeps/unix/sysv/linux/timer_routines.c +++ b/sysdeps/unix/sysv/linux/timer_routines.c @@ -42,14 +42,6 @@ struct thread_start_data static void * timer_sigev_thread (void *arg) { - /* The parent thread has all signals blocked. This is a bit - surprising for user code, although valid. We unblock all - signals. */ - sigset_t ss; - sigemptyset (&ss); - INTERNAL_SYSCALL_DECL (err); - INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, NULL, _NSIG / 8); - struct thread_start_data *td = (struct thread_start_data *) arg; void (*thrfunc) (sigval_t) = td->thrfunc; @@ -69,65 +61,49 @@ timer_sigev_thread (void *arg) static void * timer_helper_thread (void *arg) { - /* Wait for the SIGTIMER signal, allowing the setXid signal, and - none else. */ - sigset_t ss; - sigemptyset (&ss); - __sigaddset (&ss, SIGTIMER); - /* Endless loop of waiting for signals. The loop is only ended when the thread is canceled. */ while (1) { siginfo_t si; - /* sigwaitinfo cannot be used here, since it deletes - SIGCANCEL == SIGTIMER from the set. */ - - /* XXX The size argument hopefully will have to be changed to the - real size of the user-level sigset_t. */ - int result = SYSCALL_CANCEL (rt_sigtimedwait, &ss, &si, NULL, _NSIG / 8); - - if (result > 0) + while (sigwaitinfo (&sigtimer_set, &si) < 0); + if (si.si_code == SI_TIMER) { - if (si.si_code == SI_TIMER) - { - struct timer *tk = (struct timer *) si.si_ptr; + struct timer *tk = (struct timer *) si.si_ptr; + + /* Check the timer is still used and will not go away + while we are reading the values here. */ + pthread_mutex_lock (&__active_timer_sigev_thread_lock); - /* Check the timer is still used and will not go away - while we are reading the values here. */ - pthread_mutex_lock (&__active_timer_sigev_thread_lock); + struct timer *runp = __active_timer_sigev_thread; + while (runp != NULL) + if (runp == tk) + break; + else + runp = runp->next; - struct timer *runp = __active_timer_sigev_thread; - while (runp != NULL) - if (runp == tk) - break; - else - runp = runp->next; + if (runp != NULL) + { + struct thread_start_data *td = malloc (sizeof (*td)); - if (runp != NULL) + /* There is not much we can do if the allocation fails. */ + if (td != NULL) { - struct thread_start_data *td = malloc (sizeof (*td)); - - /* There is not much we can do if the allocation fails. */ - if (td != NULL) - { - /* This is the signal we are waiting for. */ - td->thrfunc = tk->thrfunc; - td->sival = tk->sival; - - pthread_t th; - (void) pthread_create (&th, &tk->attr, - timer_sigev_thread, td); - } - } + /* This is the signal we are waiting for. */ + td->thrfunc = tk->thrfunc; + td->sival = tk->sival; - pthread_mutex_unlock (&__active_timer_sigev_thread_lock); + pthread_t th; + pthread_create (&th, &tk->attr, timer_sigev_thread, td); + } } - else if (si.si_code == SI_TKILL) - /* The thread is canceled. */ - pthread_exit (NULL); + + pthread_mutex_unlock (&__active_timer_sigev_thread_lock); } + else if (si.si_code == SI_TKILL) + /* The thread is canceled. */ + pthread_exit (NULL); } } @@ -161,15 +137,10 @@ __start_helper_thread (void) /* Block all signals in the helper thread but SIGSETXID. To do this thoroughly we temporarily have to block all signals here. The - helper can lose wakeups if SIGCANCEL is not blocked throughout, - but sigfillset omits it SIGSETXID. So, we add SIGCANCEL back - explicitly here. */ + helper can lose wakeups if SIGTIMER is not blocked throughout. */ sigset_t ss; - sigset_t oss; - sigfillset (&ss); - __sigaddset (&ss, SIGTIMER); - INTERNAL_SYSCALL_DECL (err); - INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, &oss, _NSIG / 8); + __libc_signal_block_app (&ss); + __libc_signal_block_sigtimer (NULL); /* Create the helper thread for this timer. */ pthread_t th; @@ -179,8 +150,7 @@ __start_helper_thread (void) __helper_tid = ((struct pthread *) th)->tid; /* Restore the signal mask. */ - INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &oss, NULL, - _NSIG / 8); + __libc_signal_restore_set (&ss); /* No need for the attribute anymore. */ (void) pthread_attr_destroy (&attr);