From nobody Wed Oct 28 20:36:00 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 4jFJzP1cZPz6x5yh for ; Wed, 28 Oct 2026 20:36:01 +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 4jFJzN4NmFz4RPg for ; Wed, 28 Oct 2026 20:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219760; 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=dSKmQyElK3FdSKXUeU2LIRUJfYIgWOUEQZbUWJGQXiY=; b=HggtjVGQiryJBvPtjbvdSDrAfsbujtxIiML58kUGwD/CALZ95gSJeDZiiiPxOIN8RBY7kA ahU484gCyMzV9rhQ7UxSNqaClb1Zr32K/wfpcK6gdqgaZP4o8F6qUTjwVMc3bVfRukDfsI W3LsKhQ+tPwNyGxtjbencdxbrU/HcYUSaSYYVP15FMnfabL7r7dlcdhsBOWOKz0jpxKc3I eNnis1z5caVX9hsum04f/x+A0M91S0NnrnA0ejeRBjpZ2VHAySzBJ1eF6LS3Ouep5yDVaR Xa2zHH0BEGfPFVfR4XwHNKOZ8sVVszr+3w3O3E8KSpDLZFh/zu9aoQaOr7tvaA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219760; b=hWr8asXL4cCx0TSnChq3lch8kZzelXl2scegiuu4huiMeLpQGY9RUdChVS3A40t9sdtAzX nR+8kRUEafdsIs9zpWO217P/SYOvyBYqKVDIOa5JHWLr8oO98wdCEdmVbf+7L+XhqjnQc4 WWmyAwtwi/KYE24DUWtvoWAV8ENIseJKPNkraQnZarQ/AYmvM9Os8geIoUN+D/NdGI60o8 kT/S/u/sqjcWlKWPHCiRtOTkn3oTKKHezq0uCCexbYyVn784fldqDdtih/occQPpAxbahq Ac1PUn3+46RoRX01Jch4Lkgyxs6R40naltrx+Pw8+aXS/yp3Hr7GUmBgfMIkgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219760; 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=dSKmQyElK3FdSKXUeU2LIRUJfYIgWOUEQZbUWJGQXiY=; b=iBq+XNyLRcnURr18rcX+qPauCLKhvEXRqsSjp8JuZI74VABFL1iTtMs9sbDT4hQWyV4yTR 90RrFqxPd8HWkYYdPquma4eNPamJytFW+e2XASWAaisjaO9zrPbj992y77bCrgLuF418gn oYBFGlTg8DxrbqdVkblLuZDnhQlnoqb2ziDu+dPkECNSKkNqMjNxN6K67/FOKNw6fL9qNx 1lR6xwMcwGfL6wXLvpMuxiTjtIH4m2170CMDZnRMXfFtvw6c7PAhj9DbgFQ3TOCvjWgpyp PgbUigz7S/Y5xtf5aipnKM8E81m803mFJjVENUN2sNWqSkqoGAoLRyvywtm4Wg== 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 4jFJzN438Dz1MTY for ; Wed, 28 Oct 2026 20:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a2ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:36:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: 0dc07bbc7769 - stable/15 - pf: Register the netlink family only while the vnets are set up List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 0dc07bbc7769a885d188e2137bfc9def112ded0b Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:36:00 +0000 Message-Id: <6ae25cb0.1a2ff.243aa2fe@gitrepo.freebsd.org> The branch stable/15 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=0dc07bbc7769a885d188e2137bfc9def112ded0b commit 0dc07bbc7769a885d188e2137bfc9def112ded0b Author: R. Christian McDonald AuthorDate: 2026-10-13 19:22:30 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:34:17 +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 (cherry picked from commit 68831d2a2cbb34e8daf24db7e4e15b8c09451f85) --- 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 0ba1f910bf2a..5260ced4088c 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -7196,8 +7196,6 @@ pf_unload(void *dummy __unused) } sx_xunlock(&pf_end_lock); - pf_nl_unregister(); - if (pf_dev != NULL) destroy_dev(pf_dev); @@ -7225,6 +7223,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) { @@ -7233,7 +7251,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