From nobody Wed Feb 18 17:46:33 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 4fGP8B0C8xz6SXw2 for ; Wed, 18 Feb 2026 17:46:34 +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 4fGP894s1Fz3Q5M for ; Wed, 18 Feb 2026 17:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771436793; 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=2gMeePdXA7BV/32BJ0jxL8GtJ4O5tJcLC5eO66MlMOc=; b=aIkczFWGQX4BYS/HdobDdjM0BYy6dlcylZxDvuqNvzmcvI12D8JbkC//wlfnelllTiaoWQ PwwsbRACtVwoWwvVx+T4sKlz63QF/g/4DFxTOV/5TCrNaA1d3nSS3qSs6+gim+eDWs37yu l/lr8UQKz9szxLSbRDnUhwfPvXuHw2+ZFBwY1Xqt/EcxelWeCgv63StwPUrx7kOo6lDuiA ga3HGY0ZlXOUMTWdyTCjqRzacOTWLxMXAXEwg9TD44vdTPotVsAjAe9fvcwGmPcuG1/rFc XOea/okAHnizGVVA4aq3M8FRhgVNwRTawuNOHkqeQjzyNwXuD9FYwA67gc/O9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771436793; a=rsa-sha256; cv=none; b=qEd6HtquUgsTEdvQg8MXMUW3Xc26ZEfgLOMX3o1mMN+2J7Sk0W0jQaHSs+nKSjqBUXmwA0 sM+DVqsGOHAQGNSLg/u5nFuAqA9H2R8TcRp7zqzhPNALOQBZp0+w8M0uQ0GqrJgJ37B45B b8t22WingPTipjpiNlkwecxv+/P8mwqNamLgMi+I6SS4lLplRkeK7KyA5lWamNKHMBuOct ZYFmNGzkKTIV47sCqyiSj0qjW1Dhm3GRMheXMK6y05qVhY/2Aqq3ae/Sggt44zTjVoZsNY sYjnLgqye7eVSNktg6CGaWez7s7yHhGAyplZvyserPFw9y3BiJrKeNKAZqiq5w== 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=1771436793; 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=2gMeePdXA7BV/32BJ0jxL8GtJ4O5tJcLC5eO66MlMOc=; b=I9UDChWwNTs7crJb0TOpHmN2ysBRYgq4Zoq/zX7hlhPUGo+4uOubaAy7NhFf7gJgcreVsL 23XHC8NdWLr6qS9lWUOhI/CgBZ+fftrJnlQ4tk19623YnZU/ue3ThlInekEwoCRmzoZOTB /BzjWi/imIRywdrQWTQWUExg8Ve5W4+C7ymOOgW/ZeSzDxpyk+f5iah4R1bGPoTBhwyUXY 4Maj2gzJO5M/OoJCI/PlVA/an/QM1D28dbWFSnm0nTcQDl/Vdz1Xuj2oueal5jiRKO2QC/ S25yFX8DGA9KyN/CUBTvfwjjqP1Y7fJozlS19VYfM2cEWk51nlsJRx89lUp/mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGP893dHRz157L for ; Wed, 18 Feb 2026 17:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 17:46:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Pouria Mousavizadeh Tehrani Subject: git: 4dc38e71ccd5 - stable/14 - 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4dc38e71ccd522bc5460f3ded3977baa35dad4b9 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 17:46:33 +0000 Message-Id: <6995faf9.3b0c4.5a0022c5@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=4dc38e71ccd522bc5460f3ded3977baa35dad4b9 commit 4dc38e71ccd522bc5460f3ded3977baa35dad4b9 Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-18 17:45:18 +0000 ng_ksocket: use new macros to lock socket buffers PR: 292885 Reported by: Walker R. Thompson (cherry picked from commit 1a3d1be4965afddded0b2582b9c4969c1e6a4129) --- 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;