From nobody Tue Nov 10 00:22:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jNnQl2shNz70lLS for ; Tue, 10 Nov 2026 00:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNnQl0RGDz3Qsm for ; Tue, 10 Nov 2026 00:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794270127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SsYpgvWgKATArvpATxIK1vh8IjT//QqmtEh1Q4rp5eY=; b=RBI6cmSRjln2HNWn89GNCKgZOWVTiE+LOwfG3XL7bhM4WDQ6g2FIPC/3xtaMyZcT5VBNHe bhQ5aEuxnEyaxbvJB1q6OjLb4BbKgx+nEcuDGeGUbhtK6R6yciwAttCPySf5Z8V0HI5o8k 4iqLpJy67NSNXgrBDOXXlqZZxtGTzrg5SEPls8ORW1m1WUvERv5a5+Yi+nRSjJNSOvlZjW kka+0Ypbf8Nr5YcXH/EPt/3WajsWrHHsN5u8kgc+uhrMMSvUqMv7L9qrD3qNS8RD0CcUX5 P8UVbzTvtzQuhPEbpYoVQ7nEBSMepf4AHF3TePHpWPqiq3Ru0Kj4jOXBTLxiUA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794270127; b=pSCrdNt8LCSSN0Y8w1Z8HTxLKCEo/P8lSDQlmLT1OgvB2QoC1M3DazVycrbIntQILI+hWt /7iJDtXXOJ/kalM8UMku0mpBmHKC5D2M/b1ApSUTm3LQDhBC5U+izyj1DPET+8Cwo7odhg SL8XQVqR5DKrP/fmDVvjq0ANsQThJDdgGGCDXOIEMPoGwDdAxALFAifawlKLJIDuD5FptZ QqFXJuIfBa7xcxgoY26vWy+sUZD0RBWoD2v/AKq9AuOjYEOpSnM50uCJ4aK6ZCUxw6sxYx B/ikrJFBpRpA7qV+wUyLOTZYxvF4/5D6LRjwHM1ebhu0m4x6b/l+PPBtZL+IvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794270127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SsYpgvWgKATArvpATxIK1vh8IjT//QqmtEh1Q4rp5eY=; b=kzplIYSWLJcXFd4UFyZZAbfiAOh5dqRl1pYbvvEJ2E7Oqwo7cC/4bh3Fp7Jp5qaqirDpyZ WEgTB1OWxR6lr3k1AFj0SyTOLp6ApWogOupO4MtHCqVqWWb26y+xtLU89s9NiHLv+nGWQk o45P2abEN5vUW7cpzlOKPJOmMKBWL7s2Grer8Wy5VgAvjkof12tokT8yZRzWiRUN3si9Gu c2WqS6f2ehjZQ4KamcXdnh4oC7E0FTn1/k9yz1IJVMuhOv4tA867dg1qartqSgiJ8MhG7R +YejDPlneEiCsj3nuqvYpjAd0mWXUm3u8hTpyCwJQLZe744jSa5P8zYrRpK6wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jNnQl05wnz13r8 for ; Tue, 10 Nov 2026 00:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f513 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 00:22:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8331d5a2fe96 - main - pthread_cond_clockwait(3): explicitly reject unacceptable clockids List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8331d5a2fe967016343fb4322f1ed73e55ff9655 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 00:22:07 +0000 Message-Id: <6af263af.f513.9b54800@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8331d5a2fe967016343fb4322f1ed73e55ff9655 commit 8331d5a2fe967016343fb4322f1ed73e55ff9655 Author: Konstantin Belousov AuthorDate: 2026-11-05 21:38:37 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-10 00:21:18 +0000 pthread_cond_clockwait(3): explicitly reject unacceptable clockids Otherwise they are rejected by kernel in do_wait(), reached through _thr_sleep()/UMTX_OP_WAIT_UINT_PRIVATE on the user-mode path. Then, since cond_wait_user() only leaves its loop on a wakeup, a cancellation or ETIMEDOUT, the EINVAL from do_wait() results in a loop. If hit, this indicates a bug in user code, but the system library must be resilient to such misuse. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D61253 --- lib/libthr/thread/thr_cond.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c index cce2ba7b6c3c..c2ce9565e208 100644 --- a/lib/libthr/thread/thr_cond.c +++ b/lib/libthr/thread/thr_cond.c @@ -442,6 +442,8 @@ __pthread_cond_clockwait(pthread_cond_t *cond, pthread_mutex_t *mutex, if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return (EINVAL); + if (_thr_check_clockid(clockid) != 0) + return (EINVAL); return (cond_wait_common(cond, mutex, clockid, abstime, true, true)); }