From nobody Tue Mar 31 15:58:39 2026 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 4flXpm0gpPz6WDk2 for ; Tue, 31 Mar 2026 15:58:40 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flXpl4MD2z3gln for ; Tue, 31 Mar 2026 15:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972719; 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=hUenkQRAefJSPC77vIF0nLulwPwA8Yig7XcbXzKGvgw=; b=Lj8bJWDrOStkOqS188iv8xczEP0IR/u0afYm+JPxb3533Enn8A9Y1f5htmUlRz6l1VXNtl +qm/CVK0vXPKU46a/1wxiWgvVwyY5fxiFIIUECe5ypY/WXkUSbu4KLap5PaIxh6RnKKq9v nv4rwwZ0S8lj46pfAoXZqFjTNjcZ4ukIuqhy2Gp853y1JPkqDGDCZ7TQGeT6GkVjFZTpsa 57RekxwLezOGBOdXY+vD+WLV/cqMDqtRZcIB8s45z9Hzo3IDt+IOj3n16DUSjCxtC3nzgx BVaUMS2rLp7DP7zvAsqNkzIfhllndkIeXRCbaU6qnjI8nwkL7SzVUxlmWQLzVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774972719; a=rsa-sha256; cv=none; b=UKm/84VItYT/eEi7hiFzgBffy7SuSN/sQM3tC4AmYM05Bw8baRPwl3jBSYAa/hblzPxk/e bmiq7fFsnqg/2bYkc917d5cDP+S5c2YFMie9zPfu6MdKca5oet+mWfK0RUu0VnUVHUJ7my g6Nhqv8LIhqJoBVc3bbTRRlJE8RYUsPfPPGpWjubGsYifEwodMXsk59/Ku2gKwzta6CeQj JLiCFvi/QU6jhRBCfiS540yrzatlQIOEhmmXO0Us3hAksTLLW549qxiVv/g6tiAYMHfvF8 WjMGbTpsUoq7ZpCpIKb42csn+1u566mMP35vOzGJ/7TT2zzpvGcrjeehxzLsZQ== 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=1774972719; 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=hUenkQRAefJSPC77vIF0nLulwPwA8Yig7XcbXzKGvgw=; b=njEQH6qArUpV+yszwWyAB46gc/rQ/srhYAq7TLyoqeQ8WJj/R1BejC4ObdETBrTnfpryGu 7CWs8goKE+WGrW1PFcrtO3ire4OcSoXZT/SRTKhlTVbkDK+gCYpx0mnyWESFEFIUYLd5dk Z50n1WYfhpsc3xUa4NGuF0kSeM81On82nKs/yZh33lccBCMYA9fBCBldLaJcklgU35EE6R j5g4+qylDreH1UQ198XM4esO1mvdc5x+KoHwQfajMVqyUTZxYELai50H9chlXwNQ2xFrzx MS7KCpBMLhqINI2S0EBWHCJ2TJIZXZDO90A0849rtJQ51xv4IlNuDF0wmT2TSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flXpl3jvyzcHP for ; Tue, 31 Mar 2026 15:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a0b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 15:58:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a37658808b6c - stable/15 - rpc: Improve socket locking in svc_vc_accept() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: a37658808b6c6bd9a0cb585501fb3fb125b9d069 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 15:58:39 +0000 Message-Id: <69cbef2f.3a0b5.3c3b7d50@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a37658808b6c6bd9a0cb585501fb3fb125b9d069 commit a37658808b6c6bd9a0cb585501fb3fb125b9d069 Author: Mark Johnston AuthorDate: 2026-02-12 14:00:43 +0000 Commit: Mark Johnston CommitDate: 2026-03-31 15:57:27 +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 (cherry picked from commit 7c1c0e94363db09af0c260d9292160cdd2230f23) --- 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 */