From patchwork Wed Jul 13 16:21:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 56032 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0694638560AD for ; Wed, 13 Jul 2022 16:22:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0694638560AD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1657729349; bh=kjkc6d2GTXLHIwcwelSzfDD1U9j83jf9wkQb4LM7uAY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=kCg0XWjuYLiazJNtIPtJrqxWBdYp75cREN6fVFtjzgIubj2vO6gfE6o/6OlBCinFj 7hfFyOwU4d3xMVqQzOL3BqzgaXL+OoUruaMLgkWSuHK3teFEpxrDH1Iq6XslyFqdrm juXt0zfchfIfgcY7aZ05TrDHCuq0c0YcG4IJRhFM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id 0F41B38560AD for ; Wed, 13 Jul 2022 16:21:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0F41B38560AD Received: by mail-ot1-x331.google.com with SMTP id c23-20020a9d4817000000b0061c76323423so73629otf.11 for ; Wed, 13 Jul 2022 09:21:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=kjkc6d2GTXLHIwcwelSzfDD1U9j83jf9wkQb4LM7uAY=; b=0uZWFCy6xFFRHpPXQJRL0VH1Yf7IlyS/Jx9dUCEFGoIj+REDzm6TSqGvZD2GNWxcYx N0e5yDeWLiUKBxrQFUtouDEFeJWj9WNyl24WKTV5tI8CljOwhfsBJV09chpFbrjycVog o1hC7xoqQwpd3/gNdk2uTGpcMuwSY83UeyOtZy1ca0AjMbhgrOjo2OygQjiVPfSikgPe o2JL0hwGVr6kCMZVL5+0dyzhAjH2IVQpcuNHAKNLi1TXa9ucEgOU7KOmyPShHRX464Uz CEeJD1Q5mIR0BvQlL9deaOwtKthZBne4MQ0ossKgXxEykAbH7ob76pYnld9RR4H23GJb gMfA== X-Gm-Message-State: AJIora+aF7IfI70dYZXrNmR1rgPSqP32uikDQb9TPH/s+L52zZh9X6Z2 qnZZysPLkNk+L/TeCb/cX29cbSCBpil3Kg== X-Google-Smtp-Source: AGRyM1suFiUGB5VKG3BOWSlNSowREF/lLY/u5cBt146pqShJfesg8EL3L75pdwtYR5kw2+ehftYrxg== X-Received: by 2002:a9d:2602:0:b0:61c:30c1:fa03 with SMTP id a2-20020a9d2602000000b0061c30c1fa03mr1667237otb.86.1657729318182; Wed, 13 Jul 2022 09:21:58 -0700 (PDT) Received: from mandiga.. ([2804:431:c7ca:19c3:4d5a:3028:34cf:1669]) by smtp.gmail.com with ESMTPSA id a18-20020a4a6852000000b0042313f42b26sm4840328oof.39.2022.07.13.09.21.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 09:21:57 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [COMMITTED] nptl: Fix ___pthread_unregister_cancel_restore asynchronous restore Date: Wed, 13 Jul 2022 13:21:54 -0300 Message-Id: <20220713162154.1010516-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This was due a wrong revert done on 404656009b459658. Checked on x86_64-linux-gnu and i686-linux-gnu. --- 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