public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/release/2.35/master] nptl: Fix ___pthread_unregister_cancel_restore asynchronous restore
Date: Wed, 13 Jul 2022 16:28:00 +0000 (GMT)	[thread overview]
Message-ID: <20220713162800.8FE8A3856DC0@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=51e2d3b53bd08a21e5a9a4ed095abd2c61f622bc

commit 51e2d3b53bd08a21e5a9a4ed095abd2c61f622bc
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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.
    
    (cherry picked from commit f27e5e21787abc9f719879af47687221aa1027b3)

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


                 reply	other threads:[~2022-07-13 16:28 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220713162800.8FE8A3856DC0@sourceware.org \
    --to=azanella@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).