From nobody Fri Oct 30 14:08:06 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 4jGNGt5qyRz6wwZP for ; Fri, 30 Oct 2026 14:08:06 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGNGt4cT4z4qVX for ; Fri, 30 Oct 2026 14:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793369286; 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=yLniEYTgd5y5XXb5VuuzijN8SaNVW3kcSYrqojBdNpE=; b=tbkSVHjAfsYVLO6OUdOd/AYkKdmzMglRF/TpNji6drBuM2GPzzTcolZPlaiUzzqLX5yfHG VeWNLoj+p40xkhExDgP1kqwS80COySHgFOdjMMcu8pWedi5TeG/zTMbZm9egdCbKNyJ+r+ TT00MRDBcNGSKIPFlXUgvxjiIF5JPGGP452lQcHagX8Vs65FAoQArgmuH0fVSop40bBQRF pbkBwBgZbvf3+B0NMfRFah8BIyBnOcNCsKRmQ6qc0xwgAn4jhBlniMBCbDTDGsJf89JNOa EssIF82bJVT1i2bCCNovx3BLbSyerwQVIV7j0dsxmOUer8WDjDG70BamXbP1yQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793369286; b=rgjCIh4Nj6vmGbnO5u/D+Xr7atAF7T6d4fIR45fSvXaafyIlBUxpYaht4BGtJL3iV/q5e2 4g7W15f/2Yw2Z9rZatq2eU10P1pC2E3UQAm7Wx4uWCxluA4pp+sJlCamiMCxw0HY74z+77 mLLY3OcKBinJ++pbXpWj44po31OKSdw1wiabl+VSic3NuzylVOUO51os8ZMCn5lUn8UY/R OlF61FNQiSq+8leIpHIHE1YBBRK3iILBRavFRiVoTdBJ0jKzIvRvrHdp0ux0ci+kXy52Bj GOl698gFk7ClTMzmyLI3Xgw22CVHFtvFTQAM/9FIHza3P5LeZbChlSDZdOPvxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793369286; 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=yLniEYTgd5y5XXb5VuuzijN8SaNVW3kcSYrqojBdNpE=; b=HNNw9H0U1pHyZZnSnM+NHiNeS1N9u+7UEelfNK6Sp94RwywyOWZmcFzAJHfygsbuKbWQbW 7I2Ifowbh5VUXOrhFtyLpKA9i+VnWEbY4L4kdbNSf/LiUU4+x8SqPUUxIXBPUf9d9DDdW4 3lPzaeLs/+VtZIMnkjyNXhsCsW5S1DneUz3HwKl3ie4G8yHDB82BbQajxMu1RZjVreJCQ1 TmPyfCVeZUoRmDSbY7uIbuxkt9UA8RpRBruN4YiiYftiY8ukPkTJLg7oW0mCt6t7BVvgV8 MhNQv4rDYV68aeF0ykmXdoNRdU5889Fgf+GmxVKM6TQ9vXLIjjxHMrDT5U21AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jGNGt4H25zV22 for ; Fri, 30 Oct 2026 14:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 14:08:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Avinash Duduskar From: Kristof Provost Subject: git: e4c78de63e58 - main - netlink_snl: add snl_init_fd() to adopt an already open socket List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4c78de63e584617663a965fad2a4ce55f3d715a Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 14:08:06 +0000 Message-Id: <6ae4a4c6.21d1b.6633de71@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e4c78de63e584617663a965fad2a4ce55f3d715a commit e4c78de63e584617663a965fad2a4ce55f3d715a Author: Avinash Duduskar AuthorDate: 2026-10-26 14:38:10 +0000 Commit: Kristof Provost CommitDate: 2026-10-30 14:06:46 +0000 netlink_snl: add snl_init_fd() to adopt an already open socket snl_init() always creates its own socket. Split out snl_init_fd(), which initialises the state on a descriptor the caller already holds, and make snl_init() open the socket and hand it over. The state owns the descriptor either way, including when initialisation fails, and snl_free() closes it; snl_clone() remains the way to borrow one. pfctl(8) needs this to run on a socket inherited from authpf(8). PR: 291981 Signed-off-by: Avinash Duduskar Reviewed by: kp Pull Request: https://github.com/freebsd/freebsd-src/pull/2508 --- share/man/man3/snl.3 | 18 +++++++++++++++++- sys/netlink/netlink_snl.h | 16 ++++++++++++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/share/man/man3/snl.3 b/share/man/man3/snl.3 index 04bae46691bf..b385f978b841 100644 --- a/share/man/man3/snl.3 +++ b/share/man/man3/snl.3 @@ -21,11 +21,12 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.Dd December 16, 2022 +.Dd October 26, 2026 .Dt SNL 3 .Os .Sh NAME .Nm snl_init , +.Nm snl_init_fd , .Nm snl_free , .Nm snl_read_message , .Nm snl_send , @@ -52,6 +53,8 @@ .In netlink/netlink_snl_route.h .Ft "bool" .Fn snl_init "struct snl_state *ss" "int netlink_family" +.Ft "bool" +.Fn snl_init_fd "struct snl_state *ss" "int fd" .Fn snl_free "struct snl_state *ss" .Ft "struct nlmsghdr *" .Fn snl_read_message "struct snl_state *ss" @@ -101,6 +104,19 @@ Call with a pointer to the .Dv struct snl_state and the desired Netlink family to initialise the library instance. +.Fn snl_init_fd +initialises the instance on +.Fa fd , +an already open Netlink socket. +In both cases the instance owns the descriptor and +.Fn snl_free +closes it. +Ownership passes with the call: +if +.Fn snl_init_fd +fails, +.Fa fd +has already been closed. To free the library instance, call .Fn snl_free . .Pp diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 03c5a573da21..fad778ef9ce7 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -269,13 +269,11 @@ snl_free(struct snl_state *ss) } static inline bool -snl_init(struct snl_state *ss, int netlink_family) +snl_init_fd(struct snl_state *ss, int fd) { memset(ss, 0, sizeof(*ss)); - ss->fd = socket(AF_NETLINK, SOCK_RAW, netlink_family); - if (ss->fd == -1) - return (false); + ss->fd = fd; ss->init_done = true; int val = 1; @@ -307,6 +305,16 @@ snl_init(struct snl_state *ss, int netlink_family) return (true); } +static inline bool +snl_init(struct snl_state *ss, int netlink_family) +{ + memset(ss, 0, sizeof(*ss)); + ss->fd = socket(AF_NETLINK, SOCK_RAW, netlink_family); + if (ss->fd == -1) + return (false); + return (snl_init_fd(ss, ss->fd)); +} + static inline bool snl_clone(struct snl_state *ss, const struct snl_state *orig) {