From nobody Thu Feb 19 22:56:16 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 4fH7z43bKZz6Sbrv for ; Thu, 19 Feb 2026 22:56:16 +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 4fH7z41wr0z4DN0 for ; Thu, 19 Feb 2026 22:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771541776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ezOux77qg42FgnB87MPQe3mKgpdJCZ6awtGqHenp6dQ=; b=XUSuAZ0+ndpDu8/ixdNurC3Y4alNbPwcbQVB3LHkiA8dEvj2izpeHqDy38xyU4jt53jBdt cPa03V3IECPPol9FnThuYoLKKC/+8s/ZJyiJv6UoyNFrv0D6C8Cefpdjvl+Kix/UehT0Xn M8LceE/ci10cp0TJgXzK/6I1gMBJa2tU/xdZadn2QuDuIvcK0HJiTATbwXfJO75mOxwB9S aTw0sRAO4lxBf2ar8odAeOwUvxEoxoN9y1ZBKq+eHIja4VCQTp0aOzmHeN8CrQHdT06z1o +E542QnMwz4JAFhPdwPjxEb7oEXpHYvHx5pa3OjAF681mVcNR3pY+jmGa20B+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771541776; a=rsa-sha256; cv=none; b=FU1WoS2XraSVcamDmleytGbq2t1GYLWzAk3dd1nJOfcRLOZ7js7ooKeMzoeEFsc+hNVrW7 qquJpBLDWmwJDTG/x8Ai307tG41KKfNEumGLVwO8gzydXvmuFJlFi/N2yto8TJ4OBuqffv r+cYx1NeQP6/auzOHuClYkY+igQGXzwB7utx2d22iEQytxIK3XVNk/bADmk/hXNgvbItMS zcNvqaTsKvee2ig/lhAZUGgKgUz7vuQuSW7xZEW3VXST/kDhtFwcF8KHSXulpXyM6Kwgtn KV+smcFwSZt8w9WcPP1T7mBE5OgWpho1d4dRrsbZruNJWtI1D8nwAWrbiFhZVw== 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=1771541776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ezOux77qg42FgnB87MPQe3mKgpdJCZ6awtGqHenp6dQ=; b=rJEoirZ6PVA93vPLs5XNs5UjNh7V0A9NNtsgE4IhGOuD+h04ER4BlfX+n90Tg7Mym9m4Oo nCfWI7YZBIWstljJVzoeomf5dkmakQJppJ7xVS/bvgmsL4+uo4JWdkDaA8goNCNqyY0USi syGde3mOzC53gF7LaouUUMvxKiXDo+b9TLEJe2BUuerKUSYB+EnRAYtryyCC7nUHU5ObO0 BH9nqjVxrjz581uw/WHhgRSiH6C4lF7EooFgxFdgYxBbbP5d8IWkuNs8v2yQIM0oQxASs+ bhTDHaNBGPY1zptB9QihpR4LHMeh+Edcqv78VEj8pFj/hDkM9PW6z0X3U0ERBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH7z40rYRz11gY for ; Thu, 19 Feb 2026 22:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 22:56:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Colin Percival Subject: git: 7c81bf519154 - releng/14.4 - ng_ksocket: use new macros to lock socket buffers 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 7c81bf51915437bf78c63b3d4772a74bada79251 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 22:56:16 +0000 Message-Id: <69979510.33c9c.3bf61943@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7c81bf51915437bf78c63b3d4772a74bada79251 commit 7c81bf51915437bf78c63b3d4772a74bada79251 Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Colin Percival CommitDate: 2026-02-19 22:54:18 +0000 ng_ksocket: use new macros to lock socket buffers PR: 292885 Reported by: Walker R. Thompson (cherry picked from commit 1a3d1be4965afddded0b2582b9c4969c1e6a4129) (cherry picked from commit 4dc38e71ccd522bc5460f3ded3977baa35dad4b9) --- sys/netgraph/ng_ksocket.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 777f3261356d..5baf25579fd9 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -608,12 +608,12 @@ ng_ksocket_connect(hook_p hook) struct socket *const so = priv->so; /* Add our hook for incoming data and other events */ - SOCKBUF_LOCK(&priv->so->so_rcv); + SOCK_RECVBUF_LOCK(so); soupcall_set(priv->so, SO_RCV, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&priv->so->so_rcv); - SOCKBUF_LOCK(&priv->so->so_snd); + SOCK_RECVBUF_UNLOCK(so); + SOCK_SENDBUF_LOCK(so); soupcall_set(priv->so, SO_SND, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&priv->so->so_snd); + SOCK_SENDBUF_UNLOCK(so); SOCK_LOCK(priv->so); priv->so->so_state |= SS_NBIO; SOCK_UNLOCK(priv->so); @@ -1239,12 +1239,12 @@ ng_ksocket_accept(priv_p priv) */ LIST_INSERT_HEAD(&priv->embryos, priv2, siblings); - SOCKBUF_LOCK(&so->so_rcv); + SOCK_RECVBUF_LOCK(so); soupcall_set(so, SO_RCV, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&so->so_rcv); - SOCKBUF_LOCK(&so->so_snd); + SOCK_RECVBUF_UNLOCK(so); + SOCK_SENDBUF_LOCK(so); soupcall_set(so, SO_SND, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&so->so_snd); + SOCK_SENDBUF_UNLOCK(so); /* Fill in the response data and send it or return it to the caller */ resp_data = (struct ng_ksocket_accept *)resp->data;