From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 130B138560AD; Wed, 13 Jul 2022 16:21:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 130B138560AD 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] nptl: Fix ___pthread_unregister_cancel_restore asynchronous restore X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: f2698954ff9c2f9626d4bcb5a30eb5729714e0b0 X-Git-Newrev: f27e5e21787abc9f719879af47687221aa1027b3 Message-Id: <20220713162110.130B138560AD@sourceware.org> Date: Wed, 13 Jul 2022 16:21:10 +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: Wed, 13 Jul 2022 16:21:10 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f27e5e21787abc9f719879af47687221aa1027b3 commit f27e5e21787abc9f719879af47687221aa1027b3 Author: Adhemerval Zanella Date: Wed Jul 13 10:37:32 2022 -0300 nptl: Fix ___pthread_unregister_cancel_restore asynchronous restore This was due a wrong revert done on 404656009b459658. Checked on x86_64-linux-gnu and i686-linux-gnu. Diff: --- nptl/cleanup_defer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nptl/cleanup_defer.c b/nptl/cleanup_defer.c index eb0bc77740..4e864ead32 100644 --- a/nptl/cleanup_defer.c +++ b/nptl/cleanup_defer.c @@ -71,7 +71,7 @@ ___pthread_unregister_cancel_restore (__pthread_unwind_buf_t *buf) return; int cancelhandling = atomic_load_relaxed (&self->cancelhandling); - if (cancelhandling & CANCELTYPE_BITMASK) + if ((cancelhandling & CANCELTYPE_BITMASK) == 0) { int newval; do