From patchwork Thu Mar 5 00:22:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 131112 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 C94FE4BA23C0 for ; Thu, 5 Mar 2026 00:23:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C94FE4BA23C0 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 738C04BA2E17 for ; Thu, 5 Mar 2026 00:22:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 738C04BA2E17 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 738C04BA2E17 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=1772670155; cv=none; b=Cl2evGiUz2XDgiUj4HMEgOG896Pc3gIkL1oCqiYXs1XIh/qK/noOmLscIPLsbK5hbslzmJF+ZaoztEZbCv9u4YVcW/kzEqIz3DFYTeH675kGpA2KfKLWbRBq+kfRjABStpbPl0yMWWQCSb1UOf4AkNAMjVH9OGuxV0ATGEAzWis= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772670155; c=relaxed/simple; bh=GJ1xVfnHTayTzurjBy6BcICK2ObavZTSaXZrIDyQ0CY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=w//6SVcugm+1TSiNpIVKn8nUp6SiNWYkKvrJD6H/A2FxKAup1XV2b47B3iB1JKiNptrEsChPgqLNQjNXJHZ6f/WODzfBdDnWCDA9LWXAHxQ5zriHhIyD2t5IYRAhyw/pTdvq9AccE9ZMmN1Av7NYuypfLgtd7Al5isHTkqhXSo8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 738C04BA2E17 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 68856A052D; Thu, 5 Mar 2026 01:22:34 +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 48TmJQBEY6YF; Thu, 5 Mar 2026 01:22:34 +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 49513A0355; Thu, 5 Mar 2026 01:22:34 +0100 (CET) Received: from samy by end with local (Exim 4.99.1) (envelope-from ) id 1vxwU5-00000005sQ1-3Ivc; Thu, 05 Mar 2026 01:22:33 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] hurd: Fix cleaning on sigtimedwait timing out Date: Thu, 5 Mar 2026 01:22:33 +0100 Message-ID: <20260305002233.1400817-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP, URIBL_BLOCKED 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 sigtimedwait also needs to clean up preemptors and the blocked mask before returning EAGAIN. Also add some sigtimedwait testing. --- signal/Makefile | 1 + signal/tst-sigtimedwait-timeout.c | 99 +++++++++++++++++++++++++++++++ sysdeps/mach/hurd/sigtimedwait.c | 16 ++--- 3 files changed, 108 insertions(+), 8 deletions(-) create mode 100644 signal/tst-sigtimedwait-timeout.c diff --git a/signal/Makefile b/signal/Makefile index 7049c4b377..16050e82f6 100644 --- a/signal/Makefile +++ b/signal/Makefile @@ -61,6 +61,7 @@ tests := \ tst-sigset2 \ tst-sigsimple \ tst-sigwait-eintr \ + tst-sigtimedwait-timeout \ # tests include ../Rules diff --git a/signal/tst-sigtimedwait-timeout.c b/signal/tst-sigtimedwait-timeout.c new file mode 100644 index 0000000000..5acb079538 --- /dev/null +++ b/signal/tst-sigtimedwait-timeout.c @@ -0,0 +1,99 @@ +/* Test that sigtimedwait time out cleans up correctly for further signaling + Copyright (C) 2017-2026 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 + . */ + +#include +#include +#include +#include +#include +#include +#include + +static int signaled; + +/* Handler for SIGUSR1. */ +static void +sigusr1_handler (int signo) +{ + TEST_VERIFY (signo == SIGUSR1); + signaled++; +} + +/* Spawn a subprocess to send two SIGUSR1 signals. + Return the PID of the process. */ +static pid_t +signal_sender (void) +{ + pid_t pid = xfork (); + if (pid == 0) + { + static const struct timespec delay = { .tv_sec = 1 }; + if (nanosleep (&delay, NULL) != 0) + FAIL_EXIT1 ("nanosleep: %m"); + if (kill (getppid (), SIGUSR1) != 0) + FAIL_EXIT1 ("kill (SIGUSR1): %m"); + if (nanosleep (&delay, NULL) != 0) + FAIL_EXIT1 ("nanosleep: %m"); + if (kill (getppid (), SIGUSR1) != 0) + FAIL_EXIT1 ("kill (SIGUSR1): %m"); + _exit (0); + } + return pid; +} + +static int +do_test (void) +{ + if (signal (SIGUSR1, sigusr1_handler) == SIG_ERR) + FAIL_EXIT1 ("signal (SIGUSR1): %m\n"); + + sigset_t sigs; + sigemptyset (&sigs); + sigaddset (&sigs, SIGUSR1); + if (sigprocmask (SIG_BLOCK, &sigs, NULL) != 0) + FAIL_EXIT1 ("sigprocmask (SIGBLOCK, SIGUSR1): %m"); + pid_t pid = signal_sender (); + + siginfo_t info; + struct timespec ts = { .tv_nsec = 500000000 }; + int ret = sigtimedwait (&sigs, &info, &ts); + TEST_VERIFY (ret == -1); + TEST_VERIFY (errno == EAGAIN); + + static const struct timespec delay = { .tv_sec = 1 }; + if (nanosleep (&delay, NULL) != 0) + FAIL_EXIT1 ("nanosleep: %m"); + TEST_VERIFY (signaled == 0); + + if (sigprocmask (SIG_UNBLOCK, &sigs, NULL) != 0) + FAIL_EXIT1 ("sigprocmask (SIGBLOCK, SIGUSR1): %m"); + TEST_VERIFY (signaled == 1); + + if (nanosleep (&delay, NULL) != -1) + FAIL_EXIT1 ("nanosleep: %m"); + TEST_VERIFY (errno == EINTR); + TEST_VERIFY (signaled == 2); + + int status; + xwaitpid (pid, &status, 0); + TEST_VERIFY (status == 0); + + return 0; +} + +#include diff --git a/sysdeps/mach/hurd/sigtimedwait.c b/sysdeps/mach/hurd/sigtimedwait.c index 918af14a47..4ffdc1b2e6 100644 --- a/sysdeps/mach/hurd/sigtimedwait.c +++ b/sysdeps/mach/hurd/sigtimedwait.c @@ -147,17 +147,17 @@ __sigtimedwait (const sigset_t *set, siginfo_t *info, /* Timed out. */ signo = __hurd_fail (EAGAIN); } - else - { - assert (signo); - _hurd_sigstate_lock (ss); + assert (signo); - /* Delete our preemptor. */ - assert (ss->preemptors == &preemptor); - ss->preemptors = preemptor.next; - } + _hurd_sigstate_lock (ss); + + /* Delete our preemptor. */ + assert (ss->preemptors == &preemptor); + ss->preemptors = preemptor.next; + /* Restore the blocking mask. */ + ss->blocked = blocked; all_done: _hurd_sigstate_unlock (ss);