From nobody Tue Nov 17 01:09:46 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 4jT68W2Y9dz71Q2G for ; Tue, 17 Nov 2026 01:09:47 +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 4jT68W0RW6z3CWR for ; Tue, 17 Nov 2026 01:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877787; 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=8ywpchaArkSnLwc6NnJ/FDH0aN0Boe/R04H/YTnKn8w=; b=TL5rSbKL0iJE8aWjKUc/ddYkoKTb6ZKkKad5ytQ2mRVpetQbFtz3TSHr2JlQ3mGBkEork8 tZ50DVj5kw+roP/0DM9a9Y2nD469ChRHGAsoTuxdx7zx9ce5zA1izymwR7lPQ2xg30PXlG /M7p7mHPiEFx3hlgEMV0u2K3fMUCkz758ZcD2+6xfQRW+0jpaSZ+/0D0wNoGxvg9bI9IJf UF8ukHpfbRsmlzL2OPeXr2mGK96TpqZd9uZ7OcikEZB4V4O3IMF/byLgKdBal2GzIUp9zl zwe7OLkkzd6Z3JKLoTIOXPyS9nLukD7PaskIoNQo+wfP0OE5jKwFx03W24+WEw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794877787; b=JPZ5g0pjoc6Ub7FKB2ufBmQr3QHL1+qjyOIyfkYFLeXkzgcGn4+KxQaVTV1w2shaJvfJoP eL8o7+uUF00AK1ECl6E9odXANDiQnntskTLhAV4tG8/mefGaE4MGLqAGvS/YByIpZPX7Dm bYUsPVo72sVw/f9Rzwtp1Vnk8Emn2HItGAdCZ7DBMDvkwDoTMMV3BbxzK9afq1fgZayFVk uZwsZ9OzEm5yCzma5XbqJx47/OHdX0IZyrJrpws/4ct0D3gSEfGOpAhJgWQCUCnDovXhIb w1FwfFkza+xDSldDj86Ksw1bYZaO6ueHAjUh+97d477e/8unNpT+4G3aY2PyHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877787; 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=8ywpchaArkSnLwc6NnJ/FDH0aN0Boe/R04H/YTnKn8w=; b=USKxhuSh455GgA0ZQrCnyQonQ1/STwjaKmMm9mQjhU+ECMJ8KrJ7ELM34Hwos+FiMkqwC2 TAlRxzwVPdabioEF30vACIIW6j1YyKMdzUEw22kOgAvhyM8XPX6XBSQydq/0c3oOD/4NRU VJUxYPXzu4WuzdDQjPZvmD0HzJa+pofE5ZeHTG2gq2RCDcWxbZGQBEbbfN2wewQZI9PhS5 Vei+diuGECyi1B0AtyfxQfj49q+PZymXfqz6wnoG3N/CPYr1EmMTgm+110Peyb7E8wrNHS 5DtYoNleExmFM+rxfaceegigf60jczqgueD/tZAQT0nN0b0jiktO9+7B6+dJXw== 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 4jT68V6rMczHlN for ; Tue, 17 Nov 2026 01:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 119b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 01:09:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b4c8ab2b7a84 - stable/15 - pthread_mutex_timedlock(3): return EDEADLK on detected recursion attempt List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: b4c8ab2b7a84b6705a4f2adaccdbad5f45f1abc3 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 01:09:46 +0000 Message-Id: <6afba95a.119b.2ef72ab2@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c8ab2b7a84b6705a4f2adaccdbad5f45f1abc3 commit b4c8ab2b7a84b6705a4f2adaccdbad5f45f1abc3 Author: Konstantin Belousov AuthorDate: 2026-11-05 22:01:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-17 00:25:01 +0000 pthread_mutex_timedlock(3): return EDEADLK on detected recursion attempt (cherry picked from commit bf2939ea60872d7791987d1727798e90eb904279) --- lib/libthr/thread/thr_mutex.c | 22 +++++----------------- share/man/man3/pthread_mutex_timedlock.3 | 2 +- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index cd79a5d1e93d..e1e790aa43bf 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -897,23 +897,11 @@ mutex_self_lock(struct pthread_mutex *m, const struct timespec *abstime) switch (PMUTEX_TYPE(m->m_flags)) { case PTHREAD_MUTEX_ERRORCHECK: case PTHREAD_MUTEX_ADAPTIVE_NP: - if (abstime) { - if (abstime->tv_sec < 0 || abstime->tv_nsec < 0 || - abstime->tv_nsec >= 1000000000) { - ret = EINVAL; - } else { - clock_gettime(CLOCK_REALTIME, &ts1); - TIMESPEC_SUB(&ts2, abstime, &ts1); - __sys_nanosleep(&ts2, NULL); - ret = ETIMEDOUT; - } - } else { - /* - * POSIX specifies that mutexes should return - * EDEADLK if a recursive lock is detected. - */ - ret = EDEADLK; - } + /* + * POSIX specifies that mutexes should return EDEADLK + * if a recursive lock is detected. + */ + ret = EDEADLK; break; case PTHREAD_MUTEX_NORMAL: diff --git a/share/man/man3/pthread_mutex_timedlock.3 b/share/man/man3/pthread_mutex_timedlock.3 index b6e95edbe46e..793f975e286e 100644 --- a/share/man/man3/pthread_mutex_timedlock.3 +++ b/share/man/man3/pthread_mutex_timedlock.3 @@ -85,7 +85,7 @@ maximum number of recursive locks for the .Fa mutex has been exceeded. .It Bq Er EDEADLK -The current thread already owns the +The current thread already owns the error-checking .Fa mutex . .It Bq Er EOWNERDEAD The argument