From nobody Wed Aug 31 01:33:58 2022 X-Original-To: dev-commits-src-branches@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 4MHRXk3jnKz4bqdn; Wed, 31 Aug 2022 01:33:58 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MHRXk3H4Vz3Hvx; Wed, 31 Aug 2022 01:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909638; 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=jN/KMfRzf3+CzyIkWcqMClQ7UQb3oMT06qeoD6fTSzE=; b=yeK5duLtHTRL50R0WaNdSPRERWfkpy0JPXaFdmWtzxCMXLBw/ZTelVP//SJworhlY38Ae1 AG3C72jgA96nrdBxD+VB7r/G5x0BZa1ed9kZBWcfJ35ZzwfGVCmQuyaNxWHCW9hUXwg9kA Wpi5zQB4r+iZwbaR80xd6MV6lxHojhpz1gOzOhIFE6+RSZoKi69tSYjgeXPIyQwlh+vszZ o9ZpCftBBaetXbKqYhytoksaEn19xQF08yNb6wdIMtJQt0Nj9yq2Vx71m6p38fcwHJA4vy F5MPY3cAWDqRA713IyoOPAMCtw5g0TOp52n5YglLqwDvdCuOu2aFZ0JTd1c96A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MHRXk2LfCzxmp; Wed, 31 Aug 2022 01:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27V1Xwfh034551; Wed, 31 Aug 2022 01:33:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27V1XwUs034550; Wed, 31 Aug 2022 01:33:58 GMT (envelope-from git) Date: Wed, 31 Aug 2022 01:33:58 GMT Message-Id: <202208310133.27V1XwUs034550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3e39cbb10e0d - stable/12 - Fix compat10 semaphore interface race List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/12 X-Git-Reftype: branch X-Git-Commit: 3e39cbb10e0d4cf9db17ac38a0cca39aa3c5e403 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909638; 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=jN/KMfRzf3+CzyIkWcqMClQ7UQb3oMT06qeoD6fTSzE=; b=qJaQRDa65qhdWg+WT7nbhbHZQSsFXfQxvOjGIZ6X91D+YT8e7z4SpHlVqzRi7G5uIhxtCv UBVTzdRydIb2LoNVyMw7neGYKzxJjwMeu0eQIkn0O4pTUGq7PVmmaNMKfPADolD3eUusrw YnWiYQlatdJBRfEpepgzf2WN1dTXF8zw/0Dnef9eGEXqBITKawzkyUAtUOkLdSl+hflVeo p5ApbFOnXSAaBuMxrE/E4l9h3GqAgk2dmXD1Y2Qf6o7lfkmNvyas7tqgEpB9Nu2gMcHvxB IidSH6n/aL9srVvTA1cplHpkz1dBz4wpGO36p94vrcdSoZl0k8SMffuf50leMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661909638; a=rsa-sha256; cv=none; b=e4ad8ZgjVlhvVDU74g1MnHi44a+XBPeMb7cVXetTPbANEG2hbmDnjpMF2ItJVoWPjvcfzm 6nxWkQ4TNVn+qfULrA5mBUoC5ucaJuw8Pki8plAv3WSJoP9ws655sJ1kI8pTk2ti2pqpcg UAO8vHwFWoys/jZDM3b/OKoFUMJjjk2UvyB+g7niGu+zezRYsxWUZmopYj91rs6mz+vxEi 11Un1hwBtVzbCIkxePptXXjU+y8s+0aI2bU3XG0/BbXk28dg3mEMC53buCym1lSFg9xO5O zdFKu/EbbyhjqfvEMLuvnRV3xpPgeKn+oJEPTmNJ1UwyEZQ1M2305lnBInpzeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3e39cbb10e0d4cf9db17ac38a0cca39aa3c5e403 commit 3e39cbb10e0d4cf9db17ac38a0cca39aa3c5e403 Author: firk AuthorDate: 2022-08-26 08:05:56 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-31 01:33:38 +0000 Fix compat10 semaphore interface race PR: 265997 (cherry picked from commit 768f6373eb3d60e346d3bfa495e04315aeed8ff9) --- sys/kern/kern_umtx.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index be427c9b3b54..956da51f8a07 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -3182,24 +3182,28 @@ again: umtxq_insert(uq); umtxq_unlock(&uq->uq_key); rv = casueword32(&sem->_has_waiters, 0, &count1, 1); - if (rv == 0) + if (rv != -1) rv1 = fueword32(&sem->_count, &count); - if (rv == -1 || (rv == 0 && (rv1 == -1 || count != 0)) || - (rv == 1 && count1 == 0)) { + if (rv == -1 || rv1 == -1 || count != 0 || (rv == 1 && count1 == 0)) { + if (rv == 0) + suword32(&sem->_has_waiters, 0); umtxq_lock(&uq->uq_key); umtxq_unbusy(&uq->uq_key); umtxq_remove(uq); umtxq_unlock(&uq->uq_key); - if (rv == 1) { - rv = thread_check_susp(td, true); - if (rv == 0) - goto again; - error = rv; + if (rv == -1 || rv1 == -1) { + error = EFAULT; + goto out; + } + if (count != 0) { + error = 0; goto out; } + MPASS(rv == 1 && count1 == 0); + rv = thread_check_susp(td, true); if (rv == 0) - rv = rv1; - error = rv == -1 ? EFAULT : 0; + goto again; + error = rv; goto out; } umtxq_lock(&uq->uq_key);