From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-4.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 8EBB21F9F4 for ; Mon, 22 Nov 2021 19:24:52 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 969C83858010 for ; Mon, 22 Nov 2021 19:24:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 969C83858010 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637609091; bh=r6TE+0tUit1ss7dh3le3tCl6x2EDgk+H7PrfCJ6mc1k=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=TysuvqxV9QnkeQZ5Auu89Tz44CF/nas6abyILs8+BuyAbr+6LKi9/lfALECN/p/ep MSUjOT6pdJVp8HE3x9+phZsjDFCXFzM1cWwQxxHfOpuEQCrG9+ooSrmvYLNAuijCgO trABK9cnEXmuVwHqyCBxMLw1a6clzT4FwfxE9AZ8= Received: from mail-ua1-x930.google.com (mail-ua1-x930.google.com [IPv6:2607:f8b0:4864:20::930]) by sourceware.org (Postfix) with ESMTPS id DAE4D3858400 for ; Mon, 22 Nov 2021 19:24:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DAE4D3858400 Received: by mail-ua1-x930.google.com with SMTP id o1so38836151uap.4 for ; Mon, 22 Nov 2021 11:24:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=r6TE+0tUit1ss7dh3le3tCl6x2EDgk+H7PrfCJ6mc1k=; b=zvqZLvZdOkX2aTfz5RgnvxAWRThcpBSetN2ygDX3yzbti9KeEtTzuu4jOUZSuqvOci E+ujJh3AGBBAqmBDp9OnZBkZQExLFJiwaDYbhfWT1eeNLEPuaiNIzkSS6/zvBT54HA7z m0co6U0yjHkfjfT5waSpqAD9ynGRxdhLRLIwRaqKjmizgM+zkU+9v57ETD2YcpLGHj63 HnZuonkCpyyyPsEO2CPv1dNZkOkScTh6vxUVp4ZK4sWkwq/vkxKW7B5RPWib+l+e1xuS uKgXUd0OfaWxAIC8aM5+r9BXWYiS+T3Nj1aFfR3NRJrlp/hd1KvimiYIqZ1YvsxPGXYR /WiA== X-Gm-Message-State: AOAM530QazXy7jtGU5n4hzE18njCliQ3k/SDGb7WncXs2buQcw8TWmDL 492oGLZPyD5xSGLftFzczgltC4Us6iooAA== X-Google-Smtp-Source: ABdhPJw1jEvd3JaueJDDCwx+5wXGIMLVHwBq9ireI9nX8rhEl9UVcs73YlhCv9rT59/zdAx2jCC2Uw== X-Received: by 2002:a05:6102:b0c:: with SMTP id b12mr135751079vst.27.1637609070821; Mon, 22 Nov 2021 11:24:30 -0800 (PST) Received: from ?IPV6:2804:431:c7cb:e054:bce6:bc54:280c:f077? ([2804:431:c7cb:e054:bce6:bc54:280c:f077]) by smtp.gmail.com with ESMTPSA id n10sm4954263uaj.20.2021.11.22.11.24.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Nov 2021 11:24:30 -0800 (PST) Message-ID: <86cb1cdf-0fe8-3fba-5a50-9fd5a5e50ce4@linaro.org> Date: Mon, 22 Nov 2021 16:24:28 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.1 Subject: Re: [PATCH] nptl: Do not set signal mask on second setjmp return [BZ #28607] Content-Language: en-US To: Florian Weimer , libc-alpha@sourceware.org References: <87sfvtcjua.fsf@oldenburg.str.redhat.com> In-Reply-To: <87sfvtcjua.fsf@oldenburg.str.redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Cc: Gibeom Gwon Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" On 18/11/2021 17:03, Florian Weimer via Libc-alpha wrote: > __libc_signal_restore_set was in the wrong place: It also ran > when setjmp returned the second time (after pthread_exit or > pthread_cancel). This is observable with blocked pending > signals during thread exit. > > Tested on i686-linux-gnu and x86_64-linux-gnu., LGTM, thanks. Reviewed-by: Adhemerval Zanella > > --- > nptl/pthread_create.c | 4 +-- > sysdeps/pthread/Makefile | 1 + > sysdeps/pthread/tst-pthread-exit-signal.c | 45 +++++++++++++++++++++++++++++++ > 3 files changed, 48 insertions(+), 2 deletions(-) > > diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c > index d6ea43a754..bad9eeb52f 100644 > --- a/nptl/pthread_create.c > +++ b/nptl/pthread_create.c > @@ -406,8 +406,6 @@ start_thread (void *arg) > unwind_buf.priv.data.prev = NULL; > unwind_buf.priv.data.cleanup = NULL; > > - __libc_signal_restore_set (&pd->sigmask); > - > /* Allow setxid from now onwards. */ > if (__glibc_unlikely (atomic_exchange_acq (&pd->setxid_futex, 0) == -2)) > futex_wake (&pd->setxid_futex, 1, FUTEX_PRIVATE); > @@ -417,6 +415,8 @@ start_thread (void *arg) > /* Store the new cleanup handler info. */ > THREAD_SETMEM (pd, cleanup_jmp_buf, &unwind_buf); > > + __libc_signal_restore_set (&pd->sigmask); > + > LIBC_PROBE (pthread_start, 3, (pthread_t) pd, pd->start_routine, pd->arg); > > /* Run the code the user provided. */ Ok. > diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile > index df8943f486..c657101696 100644 > --- a/sysdeps/pthread/Makefile > +++ b/sysdeps/pthread/Makefile > @@ -118,6 +118,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ > tst-unload \ > tst-unwind-thread \ > tst-pt-vfork1 tst-pt-vfork2 tst-vfork1x tst-vfork2x \ > + tst-pthread-exit-signal \ > tst-pthread-setuid-loop \ > tst-pthread_cancel-exited \ > tst-pthread_cancel-select-loop \ Ok. > diff --git a/sysdeps/pthread/tst-pthread-exit-signal.c b/sysdeps/pthread/tst-pthread-exit-signal.c > new file mode 100644 > index 0000000000..b4526fe663 > --- /dev/null > +++ b/sysdeps/pthread/tst-pthread-exit-signal.c > @@ -0,0 +1,45 @@ > +/* Test that pending signals are not delivered on thread exit (bug 28607). > + Copyright (C) 2021 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 > + . */ > + > +/* Due to bug 28607, pthread_kill (or pthread_cancel) restored the > + signal mask during during thread exit, triggering the delivery of a > + blocked pending signal (SIGUSR1 in this test). */ > + > +#include > +#include > + > +static void * > +threadfunc (void *closure) > +{ > + sigset_t sigmask; > + sigfillset (&sigmask); > + xpthread_sigmask (SIG_SETMASK, &sigmask, NULL); > + xpthread_kill (pthread_self (), SIGUSR1); > + pthread_exit (NULL); > + return NULL; > +} > + > +static int > +do_test (void) > +{ > + pthread_t thr = xpthread_create (NULL, threadfunc, NULL); > + xpthread_join (thr); > + return 0; > +} > + > +#include > Ok.