From nobody Wed Aug 31 01:32:27 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 4MHRW02YDsz4bqXP; Wed, 31 Aug 2022 01:32:28 +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 4MHRW00ZMYz3DSl; Wed, 31 Aug 2022 01:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909548; 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=yBYsNIKUV/rdvJVTD8Gfcn2Z0e+KWWLnzAU6YraPR3Q=; b=DkIqz2LpgWgkye3Ki6eZYI7UWrRC5zlb+bb+EuLUTnK+egszUGNg1EgbTmdnFS6hPoiiH4 w3evBCgXkWUs520aV1RTdgsFLDB88K3fDiJue1rISPgW4O5mMtKtg3UhCzny6GCzexQCLU v/GmraG7bE4jM4DMWILX4qGBflRFv0Ye78ohVhe43bBaulq+th0OBAr10EeoekLR4WITYo eYeN7OYVqighhPse1LO/i4Nz9rTjtRdkanK/lbJxTSJ8U5ImuIlqq/vKP5cpTYAfzTbOFi 1pLxGjUULnc01p+Q4/t9iBUFKR5HissQ3K66zU+LZLm07AjenmQsf0mIWoJfVw== 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 4MHRVz6nt4zxmn; Wed, 31 Aug 2022 01:32:27 +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 27V1WR62034065; Wed, 31 Aug 2022 01:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27V1WREP034064; Wed, 31 Aug 2022 01:32:27 GMT (envelope-from git) Date: Wed, 31 Aug 2022 01:32:27 GMT Message-Id: <202208310132.27V1WREP034064@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: 7e8fa3c9a210 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 7e8fa3c9a2102cff1a76cc74c4c739e039c59d23 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909548; 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=yBYsNIKUV/rdvJVTD8Gfcn2Z0e+KWWLnzAU6YraPR3Q=; b=skyzpPS/rB94Np9Au3VAXqjDLoaXBbNIik0VK6ZbDukckfOy5upLKurbre64x1A+YJWAha w/c6BeFw5LQswah+RmAbH38GFP2U4HCUq6Z4hVZXpgEjqGNtbayHhskrmpOVN1jLI3MQgK HjfaICjQfzYZd/1nwmusW6miv1ch5/Wjck0LUkCFSw/78D/1HYlJRRJME+xK3GDlFnrpEV SgDz9zu4yvczjgisFg7XmbXP3QOITnRp83IrpggsVN6t9KwwZc0ppGJ+1v/9e8p+YTArXu RM2JsC3vwi86rBO4EBbRF4rkle+WY09o70gbDf4lYCllso1CvXS+BgoPYwdeBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661909548; a=rsa-sha256; cv=none; b=E8AxP5zVXzgqgH+IxlB0KarGuCt3MYR6jvPWMFAblXOL7/szQrclcvObnWmCGeBYqAYr7+ 8NfWTHgCtigNcp5HlRT9VblGO5xFC2Qfm48CZyZfdSLcNtthnnlaQeWcuI3Bu+P7kGgE7t MS1EI5O2AY1TgnmVJM2CVaVaYlGC7WjR0CRdNHJDfErFuI1J9B5zBWnAYZ62XZbTn+9UV0 eXRDhjiKP7U4euWRMJeyFDbd07JGtwatKUy7bFoxpHLRgr11Hgl1EVRoWSa1hBU1CLnWxi 60Krd0qlCP7RwiV3KR9aJ/LU3fmwOlC005pjWXXFoN55wqm/APJb3G1V8NcaLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7e8fa3c9a2102cff1a76cc74c4c739e039c59d23 commit 7e8fa3c9a2102cff1a76cc74c4c739e039c59d23 Author: firk AuthorDate: 2022-08-26 08:05:56 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-31 01:20:29 +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 513b084ea489..6aac9f3311d6 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -3513,24 +3513,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);