From nobody Tue Jan 6 15:57:05 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 4dlwlj6y1jz6NnGP for ; Tue, 06 Jan 2026 15:57:05 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dlwlj4fXLz3rtk for ; Tue, 06 Jan 2026 15:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767715025; 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=TkPBYCnFjnvh/XO+h802togxxoze9OUTdbx7cBm/BgQ=; b=YXi8tNIKm2UixULRc8QgnpcxfFkyI1YxpJopdmN42EREsYCFTJPaQ7LaCja6VztVXPnDRU 6DH4ns/CVi1hH9VFQBGc7YQAZyX2prK61ch+COIDuTe2uQIF9V8JgUtpJwy7CNZ9AwYBML /76qij1IEN38ly/JmCuf2P5xns4hbUbUFPIJd+7lDoWYgR10b39QPZNUWU4UDj+ggigkPe wU9UkE3CIin4gRtI5C6LGsifPrsFYFP7NQ1yYLRlXBRm3ahlrMpLPw+UlmfyEQgMMp370+ b/AIXPvYctkzPPkfZ2Ua3d8llkKXm17kX0gUWbND/Ot+gr+uAEbvoXYsGi4GDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767715025; 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=TkPBYCnFjnvh/XO+h802togxxoze9OUTdbx7cBm/BgQ=; b=wwKRfYRKk74dG+h3DLC1hm6kb4ZacMrLI1nc37GDZiIbog0mYXMEJ4PyQV1aCXcaBT6Rej EKXMhDI+VtuAEiyn/qlkf85z2cqzzIkTjplpJWcDam5fMEnAhnKnFut3sGfR4HHMqP1Y1l oonl5jPQ0c1S8xkx3cSPwsv0TgnKQYrdDWq4gJpCjt7Kn2hymSydLYfFL59f9InFV7RFaT 9eMXn1DPyTTZO6586XNOumopYjKOAwZbo3d1eUkMr1xQ+bpOkw9YhmoPsS2GUdvdETjWlQ XQ8o6Q1OPYkQAVko6T3ZNIZQRmEJwpLi6h981oyA/6SYCHAv6wAGDXc6c1ooQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767715025; a=rsa-sha256; cv=none; b=xO1I2732ZGwKrYjgVI/YvGVc6m//gf2/G+gLzPixIfDa3cDlm8x2QuloQQoNy0Eh/ZCM38 EvcJ3ossVxmnZZgssUQ/aijDYqMocyK5hdBBVgeWIoAG0IU/Vl3OA1T7NqMqNkJ7nSkqv8 xbyTV8+XrJcJ5OnqeXeU5TAV8LscEDylcMRBT3b2Ez+taJFfRGhPi7w0HU3mXipR33MKKi 6Qm0ME4THyBUOpwicMp1mQ0W9/+Mgkftkeb9qDETk/O+DxqW4izV7xFs203pAau69YYpLe aDm4HIkuILmjsbiYSMrXbpegH0dUNs/tB4eXH02i/U2VvxZ+jfI8iLxKRvo3FA== 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 4dlwlj4FFSz1CX9 for ; Tue, 06 Jan 2026 15:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24a6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Jan 2026 15:57:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3025957f6556 - stable/15 - pf: Fix state handling when ICMP packets are diverted 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3025957f65567149bcba058555ffcc421d462581 Auto-Submitted: auto-generated Date: Tue, 06 Jan 2026 15:57:05 +0000 Message-Id: <695d30d1.24a6d.2ce9f364@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3025957f65567149bcba058555ffcc421d462581 commit 3025957f65567149bcba058555ffcc421d462581 Author: Mark Johnston AuthorDate: 2025-12-20 18:18:50 +0000 Commit: Mark Johnston CommitDate: 2026-01-06 15:56:49 +0000 pf: Fix state handling when ICMP packets are diverted Commit 66f2f1c83247 ("pf: handle divert packets") missed a case that I happened to hit while testing something. Add a regression test for the ICMP case, based on the existing test. Fix a buglet in the existing test (missing whitespace after "["). Reviewed by: kp Sponsored by: OPNsense Sponsored by: Klara, Inc. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54321 (cherry picked from commit 15178d8ed2904d5c4fa31a1531e60dcb1e0f9209) --- sys/netpfil/pf/pf.c | 10 ++++++---- tests/sys/netpfil/pf/divert-to.sh | 40 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1fdfd6e0f38b..567615acdf0c 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -11123,10 +11123,12 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 } action = pf_test_state_icmp(&s, &pd, &reason); if (action == PF_PASS || action == PF_AFRT) { - if (V_pfsync_update_state_ptr != NULL) - V_pfsync_update_state_ptr(s); - r = s->rule; - a = s->anchor; + if (s != NULL) { + if (V_pfsync_update_state_ptr != NULL) + V_pfsync_update_state_ptr(s); + r = s->rule; + a = s->anchor; + } } else if (s == NULL) action = pf_test_rule(&r, &s, &pd, &a, &ruleset, &reason, inp, &match_rules); diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh index 153136199311..3028c9e75afd 100644 --- a/tests/sys/netpfil/pf/divert-to.sh +++ b/tests/sys/netpfil/pf/divert-to.sh @@ -402,8 +402,7 @@ pr260867_body() "pass in on ${epair}b proto tcp from any to port 7 divert-to 0.0.0.0 port 1001" reply=$(echo "foo" | nc -N 192.0.2.2 7) - if ["${reply}" != "foo" ]; - then + if [ "${reply}" != "foo" ]; then atf_fail "Did not receive echo reply" fi } @@ -413,6 +412,42 @@ pr260867_cleanup() pft_cleanup } +atf_test_case "pr260867_icmp" "cleanup" +pr260867_icmp_head() +{ + atf_set descr 'Variant of the PR260867 test' + atf_set require.user root +} + +pr260867_icmp_body() +{ + pft_init + divert_init + + epair=$(vnet_mkepair) + + atf_check ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec alcatraz $(atf_get_srcdir)/../common/divapp 1001 divert-back & + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "pass in on ${epair}b proto icmp from any to any divert-to 0.0.0.0 port 1001" + + atf_check -o ignore ping -c 3 192.0.2.2 +} + +pr260867_icmp_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "in_div" @@ -426,4 +461,5 @@ atf_init_test_cases() atf_add_test_case "in_dn_in_div_in_out_div_out_dn_out" atf_add_test_case "pr260867" + atf_add_test_case "pr260867_icmp" }