From nobody Thu Feb 12 14:07:14 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 4fBcYt5DLyz6RgGD for ; Thu, 12 Feb 2026 14:07:14 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBcYt3Nbjz3nbT for ; Thu, 12 Feb 2026 14:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770905234; 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=KAqnOh02ENrDNYR5iJ3tcmsXZREj7rJ8ThWA35EF3To=; b=mkTQeihJdpucJujNN4XtrI5v9O53HnzyLO4gIsxGlx0P0EuTQQ+quRJgmOM3Ol1UKhlMvy joAz4BsmLnSNK6NQaYorAufmdip2AZbtVj25kEgCcZPgMg+iJTYpDgdhJg/OjlQwPV0iH9 n/jw7GadXJGALlfcoei3qHlqXSZ7wt2jnup32icTr9z+eeVJIvGuwnpCBAFstjJYPCKvkn 68CasDjoOEiGaZGJlLSFcl3/gdmeR/NQSs1mubL801oRItfTc+aIT4wyOUOgGyCpbWR01y 0RNSiefvx/YiBVhH6nLhxtjA9sErsBrz5tsD2/CPiq3+KNAOyklaFq++GNx0yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770905234; a=rsa-sha256; cv=none; b=M5hVsj/8lVigivUkSmoLxPLvnSpmp7fFZh7FgVlvbezT75XKeDycKf5wVWJbkKayvfPQ/K XTVLp9BoohEU6yfsWWdNND3I1Tipd/57R0mEuwOwHn0nd9Bu4bdIdtb1MnOFDgwWFAcSKy OaLbgopTxyuv3BJIi1NwKYvz1zNQBeHXazITy0sdAmejNQrk/kgWIW0XaFgHoReMKDQ6z5 a2R4vcvocF01+dzzRC/mfxmOSNfzidANXtGFLkikxJCQTtnlLPgG279Ai3VSup+qm0TblO BHMbQWOpoP4cGbFjWx50SQTy8nV/EROSMDtzCCmjVSSn9gvp4BXJzW9Pk49ayA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770905234; 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=KAqnOh02ENrDNYR5iJ3tcmsXZREj7rJ8ThWA35EF3To=; b=lFZB4bvi0UfOcO0Hxa4Ce2u7Wb7dWg88/rVv8XaUN1x3B5lgEfHSbiTgKOB6B+wWb+J71L /+FExPQZTbKbolH0fhAWGy0vZn2MldCRCFifBKjOzxnrm+mP7uT/4ovqj8t2fsWk8Lt+uw cY4ZGaVrLBTSLHrER0vxh7kGVAhmfRYjz894L7kxiChDSvAeMRNGcm0RXDzVfMW+TCd0ta iCbEVKlazSM97S4MClD+wD5JXy2Unk6f+kc2d2VWqU6PKYBwimNmyprSpkTK4+AQOKd14z H8O5MaoFKo5Gmg+nfAG0Cy9PEBI0N7oe1vxeogBcv0qhr0xQ5E6pMnpA0JfmLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBcYt2xwlzfyn for ; Thu, 12 Feb 2026 14:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c7d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 14:07:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7c1c0e94363d - main - rpc: Improve socket locking in svc_vc_accept() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c1c0e94363db09af0c260d9292160cdd2230f23 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 14:07:14 +0000 Message-Id: <698dde92.3c7d9.165d84c1@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7c1c0e94363db09af0c260d9292160cdd2230f23 commit 7c1c0e94363db09af0c260d9292160cdd2230f23 Author: Mark Johnston AuthorDate: 2026-02-12 14:00:43 +0000 Commit: Mark Johnston CommitDate: 2026-02-12 14:00:43 +0000 rpc: Improve socket locking in svc_vc_accept() so_state modifications must be synchronized by the socket lock. For the listening socket this probably doesn't matter but for the child socket I think it's possible that this unlocked update clobbers a state transition if the nascent connection is being disconnected for some reason. Also fix the line which potentially clears SS_NBIO in the listening socket. It is unclear whether this code is used at all. Reviewed by: glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55247 --- sys/rpc/svc_vc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c index 7e30582c59e0..848109704ad0 100644 --- a/sys/rpc/svc_vc.c +++ b/sys/rpc/svc_vc.c @@ -389,12 +389,15 @@ svc_vc_accept(struct socket *head, struct socket **sop) SOLISTEN_LOCK(head); nbio = head->so_state & SS_NBIO; head->so_state |= SS_NBIO; - error = solisten_dequeue(head, &so, 0); - head->so_state &= (nbio & ~SS_NBIO); + error = solisten_dequeue(head, &so, nbio ? SOCK_NONBLOCK : 0); + if (nbio == 0) { + SOLISTEN_LOCK(head); + head->so_state &= ~SS_NBIO; + SOLISTEN_UNLOCK(head); + } if (error) goto done; - so->so_state |= nbio; *sop = so; /* connection has been removed from the listen queue */