From nobody Tue Oct 13 19:23:01 2026 X-Original-To: dev-commits-src-main@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 4j44460fsYz6w27p for ; Tue, 13 Oct 2026 19:23:02 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j44455V4Gz3NKx for ; Tue, 13 Oct 2026 19:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791919381; 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=w7sbRhq4Cy5tm7If0h6vApEKanWKcnhsl5GbcoCf/hM=; b=flJY8CkM3Fs6A5kknguNxj165ScEcI8iuX40uCwIKFgWjk6JbZkkUUZsJ/HaFTMEci6XiT SoLVmsG7c8eefX6xY9pbdjHae0+H9TKjE1Q1f0rw6Uq7bHZ2exn/DQ5D9DCsgK/b3b3/gp Scf/XDoJx29OlX7yaV9ew212z4vgTw+CpaDhnxjMx4TLDkLUgs4rk02CcbcmkWcfGYE45V nZ1IQnXnemmjMvt7Zm1+b/HJ5ze69FKPUgJQOOcu4CVm3BsZkUZ02EuV9lNhMx1RbRal2T qddaY6uCs99RYgf9+wEYQWnhR+IUSnmFYScM6+5aX7Av5BOIk4QSBFA5lotH/A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791919381; b=V8gqQLLWFU7dGLrlkuX+zO6t7M8Bqyhu+vlCi6+rf6RFa//k9bymWKLsR4+0E7444xWrUU Zr/hUZITZ1AxNqvMkmGSA2kuj1oc4vsgnXzj8g/zHyd5IsAajoB9fVihvPEcXr3OFKjb5w baO08ImmU9TmKgIkaqUIrwUWoy5CtYmNWGgUBw2PSrM60nUxjxebnSsjnqmyBnm4MxiDh+ 6ZvpIZWZK0E4mKLGr7BkYvM1Dh9ED+4zOaPn+8+3DOMYcGToPvkpvNNERFMAXpWVo9g8Lj 2TESezHufkQD9BVALtLCGl+SZQuB1Ravk+ddoABE3BLQWPORDKlzUm/UeVsg5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791919381; 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=w7sbRhq4Cy5tm7If0h6vApEKanWKcnhsl5GbcoCf/hM=; b=LkvytLcf56ZDtWZeuRI/FDJg07rL55up0XBiecuA6Efo53mSJx1a9g+/phdv590o6p8vit UKA6OR+8RoIYAFR3dA/RfJ8gZmwu0mfKm8Ax8qRAriMWu0fG5txezmyhAZgmRAmrmhhlpg 3NKUobVbZzWTi+woNM49VFvSN/OqvnUdUoK6e0Rws+pZ/fsuAVetYXd5xG+48d2agkxwig KdFmB4iHPNRn6o+JHKosWYQEFcmPXbrjMUIaSQE4K5S/UnRX8EOlHpDSV2mvVwIQc7p8Te gosVucE/H1+HXXwQB9bTQ1sUKvDNP1fCXd4JFEMxXgPSHGv7M7VH49hw1R9m7w== 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 4j44454TXYzSDx for ; Tue, 13 Oct 2026 19:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fff5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 19:23:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 68831d2a2cbb - main - pf: Register the netlink family only while the vnets are set up List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68831d2a2cbb34e8daf24db7e4e15b8c09451f85 Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 19:23:01 +0000 Message-Id: <6ace8515.3fff5.681d2889@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=68831d2a2cbb34e8daf24db7e4e15b8c09451f85 commit 68831d2a2cbb34e8daf24db7e4e15b8c09451f85 Author: R. Christian McDonald AuthorDate: 2026-10-13 19:22:30 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-13 19:22:30 +0000 pf: Register the netlink family only while the vnets are set up pf_modevent() registers the generic netlink family at MOD_LOAD, before vnet_pf_init() has set up the state hashes and locks the handlers use, and pf_unload() unregisters it after vnet_pf_uninit() has torn them down. Sending PFNL_CMD_GETSTATES while pf loads or unloads panics in pf_handle_getstates() on a NULL or freed V_pf_idhash. Register the family from a SYSINIT ordered after vnet_pf_init(), and unregister it from the matching SYSUNINIT, before vnet_pf_uninit(). Reviewed by: kp Fixes: 2cef62886dc7 ("pf: convert state retrieval to netlink") MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60651 --- sys/netpfil/pf/pf_ioctl.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 45712f80cad7..174582776fa7 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -7982,8 +7982,6 @@ pf_unload(void *dummy __unused) } sx_xunlock(&pf_end_lock); - pf_nl_unregister(); - if (pf_dev != NULL) destroy_dev(pf_dev); @@ -8011,6 +8009,26 @@ SYSUNINIT(pf_unload, SI_SUB_PROTO_FIREWALL, SI_ORDER_SECOND, pf_unload, NULL); VNET_SYSUNINIT(vnet_pf_uninit, SI_SUB_PROTO_FIREWALL, SI_ORDER_THIRD, vnet_pf_uninit, NULL); +/* + * The netlink handlers use the per-vnet state: register them after + * vnet_pf_init() and unregister them before vnet_pf_uninit(). + */ +static void +pf_nl_init(void *unused __unused) +{ + + pf_nl_register(); +} +SYSINIT(pf_nl, SI_SUB_PROTO_FIREWALL, SI_ORDER_FOURTH, pf_nl_init, NULL); + +static void +pf_nl_uninit(void *unused __unused) +{ + + pf_nl_unregister(); +} +SYSUNINIT(pf_nl, SI_SUB_PROTO_FIREWALL, SI_ORDER_FOURTH, pf_nl_uninit, NULL); + static int pf_modevent(module_t mod, int type, void *data) { @@ -8019,7 +8037,6 @@ pf_modevent(module_t mod, int type, void *data) switch(type) { case MOD_LOAD: error = pf_load(); - pf_nl_register(); break; case MOD_UNLOAD: /* Handled in SYSUNINIT(pf_unload) to ensure it's done after