From patchwork Wed Mar 4 01:15:51 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 131043 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 1BF9B4BA2E3D for ; Wed, 4 Mar 2026 01:16:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1BF9B4BA2E3D X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 3ACCD4BA2E0E for ; Wed, 4 Mar 2026 01:15:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3ACCD4BA2E0E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3ACCD4BA2E0E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772586954; cv=none; b=ZfO+0DlfUQ45t39cir2TJakUyt1cRld0/w+7KJq5zi78k6GKLIiBE5/kxvm5YpRyLV+IuV2neNS3klwdRkB05QJncl3NHZ5sqAsC0vge+S/NnlLTtBJJ2ZlZMimA+z7941+5UMG7tFmFB2JT6NpIZokm6WD47MbBhqn36Me0GYQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772586954; c=relaxed/simple; bh=tWin9qH51DuTJQGuYYYNZDE3KXfan+6Kq/d6IhteLdE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=gnlr7LlaXQxvFePYZY8/2GjaAVASPqi2lZvzOqevLOf0B3KXtTfPl2NxHHio+5aWvLKXpXer/04MC4TQsMKx3lSn52v31rfv2zpvChuORk/NbGAdbgYnXj16cd2iTjbF0RjHOqAAbpOkPS19bMzrg0bOIDatcGgZlXYzvcKf/mA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3ACCD4BA2E0E Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 2625AA0261; Wed, 4 Mar 2026 02:15:53 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lAwBTnn0dZDv; Wed, 4 Mar 2026 02:15:53 +0100 (CET) Received: from end (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id DCBCBA022D; Wed, 4 Mar 2026 02:15:51 +0100 (CET) Received: from samy by end with local (Exim 4.99.1) (envelope-from ) id 1vxaq7-00000005dpU-2GeE; Wed, 04 Mar 2026 02:15:51 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org, Brent Baccala Subject: [hurd,commited] hurd: Take cancel_lock in critical section Date: Wed, 4 Mar 2026 02:15:51 +0100 Message-ID: <20260304011551.1344737-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org read/write etc. shall be signal-safe, and take cancel_lock, so we have to defer signal delivery while holding cancel_lock. Reported-by: Brent Baccala 's Claude assistant --- sysdeps/htl/pt-cond-timedwait.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysdeps/htl/pt-cond-timedwait.c b/sysdeps/htl/pt-cond-timedwait.c index d350868c2b..7a5287ca9f 100644 --- a/sysdeps/htl/pt-cond-timedwait.c +++ b/sysdeps/htl/pt-cond-timedwait.c @@ -205,6 +205,7 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond, /* We're almost done. Remove the unblock hook, restore the previous cancellation type, and check for a pending cancellation request. */ + HURD_CRITICAL_BEGIN; __pthread_mutex_lock (&self->cancel_lock); self->cancel_hook = NULL; self->cancel_hook_arg = NULL; @@ -212,6 +213,7 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond, cancelled = (self->cancel_state == PTHREAD_CANCEL_ENABLE) && self->cancel_pending; __pthread_mutex_unlock (&self->cancel_lock); + HURD_CRITICAL_END; /* Reacquire MUTEX before returning/cancelling. */ __pthread_mutex_lock (mutex);