From nobody Fri Apr 17 11:55:45 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 4fxtcd6B6Dz6ZdHX for ; Fri, 17 Apr 2026 11:55:45 +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 4fxtcd3wDYz46tn for ; Fri, 17 Apr 2026 11:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776426945; 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=c4RSnCYUS8/NFwZK9HzVyv+zHg5zuggpsN/EvsfZbqA=; b=BQdCSg9Q13P8Xvab1VtZNbRwd5xrP0nXJ5YQ9uHzhcy+XG0c5nGtuNBLQQ5Z9AjCMSrJ/N r6kbZKiJeTVBGkPGVmy/rxFbU3SQORyFjCJMBvIOrCHecmxE7XfO5K2WqVDU4ThBRyfviP T1fxbOeG9mJOoMVDhEg1Q8GDCQraMDLQV1rMWiFsa0f6X3qrz7QbPR/gjtECXmcqegz2bB MUrPX8j3PVyGCwQvYPXjs97kIMJzYvK0f7OoP7selsr12a8EVFfgcVuVebb8p+jhGvr70s L0iojkhbwqJ+yxKhoTjOrTUU+AF6pOO9F/cKLZbVWwaGWzkFEklcAqffGN1IzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776426945; a=rsa-sha256; cv=none; b=pFUA4vWUAsJzbOt6oM8jiu+ELF8L+Z5cAg6tJSRi5xJcDF+5gAD6zMAIPHZLJ2SAXxU3KZ CukrGjKPxSKyD9ocwf7xmyESavdI0n2hdtAvS69KcpgbzBVeG6kKeRdDXPc+i6eL/+snCw LOfAheKDG/IkbjhHw4LKKd9QSsZ9XxeOeJauSS7Q9yLel99T8FQga03ni4ShkWAN0/Yzmi C7QUuZkqxF+BTP0LgyFRot1rCZKynuDQTM+w+rhU5naS31uGCePql/EpMZW0kDPgR+oaUB zuMTbVbZN2qlJtyrkgZ16O6QZjM85SOCuGxrH1v6fbaBwQCEZNr7fvCJTL1cQg== 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=1776426945; 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=c4RSnCYUS8/NFwZK9HzVyv+zHg5zuggpsN/EvsfZbqA=; b=m1gveA6nkk63paynyItc9ZmTJfY8+9GDT9dNvfATtZd2Rnj/Yxrgw1MsYeF4MYNBkyYw4u cvM+4DX493oBVbYXAwjweRyz/l1OmRpsGy7oa5xQ63JKlTnLbw25++ABE8+u3xwYqnwRxT NOHU0+UA9kMgkz7LmOQb7RWHzMo+w96jHdRPdQ4JmFKii2By2FG20Jl2b1PYTjzR9ciCTR gLnDepMvqulcoUtsqYBQ3ENS14LYeKo0ips053OsDOY5IfTbMstDUjh1+9qttEX03fbt+2 ZRy7Ep2CPpC1l/ciOnv9iI5pFp5Ikjz50xYOHcrcEFTqhWNFx4pnaj+1h7ieXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxtcd2mNBzsxW for ; Fri, 17 Apr 2026 11:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a889 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 11:55:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 3c9cd6e4dc59 - main - pf: use correct address family in pfr_pool_get() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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: 3c9cd6e4dc59202f2b150a5456541629b633af3b Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 11:55:45 +0000 Message-Id: <69e21fc1.3a889.768d25ad@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c9cd6e4dc59202f2b150a5456541629b633af3b commit 3c9cd6e4dc59202f2b150a5456541629b633af3b Author: Kristof Provost AuthorDate: 2026-04-16 13:53:15 +0000 Commit: Kristof Provost CommitDate: 2026-04-17 11:55:07 +0000 pf: use correct address family in pfr_pool_get() pfr_pool_get() in call to pfr_prepare_network()must use af instead of hardcoded AF_INET Issues reported and patch submitted by: Renaud Allard OK sashan@ Obtained from: OpenBSD, sashan , 8e156a5ebe Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index 650334c45db3..e6290e622fea 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -2423,7 +2423,7 @@ _next_block: _next_entry: /* we need to increase the counter past the nested block */ - pfr_prepare_network(&umask, AF_INET, ke2->pfrke_net); + pfr_prepare_network(&umask, af, ke2->pfrke_net); pfr_sockaddr_to_pf_addr(&umask, &umask_addr); pf_poolmask(addr, addr, &umask_addr, &pfr_ffaddr, af); pf_addr_inc(addr, af);