From nobody Sat Nov 15 21:39:07 2025 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 4d86pN2X2gz6H249; Sat, 15 Nov 2025 21:39:08 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d86pM5zfxz40nt; Sat, 15 Nov 2025 21:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763242747; 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=vyYbNULhlw6mq9icAILHzMFGocJuMkYE1zip57roR24=; b=oNImpRt2f+Jv/xn6N+sBZ6Q7bpdQuZZq8wTJIw0w3o3oAXTzKcV9Qj790tvQUOoFdneUED 6lguiyyL0+/uPvA8PSdhpYX42cWeSA6LJCIh1FS5+VWKpA/hOt9pi/OJ5bv3EKGSFMFG+G AmJzG4CyPNJo2BKjakUGn4Yo/EQuDPbc00RhhYdjfQcPqaiEYHeLDb5StmAKFRYIry09dJ WaFS+yvpF1u4zL5XyTPsfJYu0RIqXTVr4YSVAo/x8n46D+xa/YohUhUbany2qS1TRVUh5o cqIELvo+GvWbDmjcHj+Cx10W7SnL8MSbml5ohmLJ1JFNIfnDR8wdDfxG/bPPtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763242747; 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=vyYbNULhlw6mq9icAILHzMFGocJuMkYE1zip57roR24=; b=Z11DljzPyjs2JsmHrbmBkOuZD7Itr13Z8B6sMnz4YbkCDxjkmkcjzJWIMsiQo6eiStNCQs qRylaprfzXRMTjSoPMmykqkQGib2HXJ3YuAEhwTRX1XPNVER93vwWn34+NgC4HmXF/tpHv 7QNos6BqsNvnCBmW64d94BhA7988Dsn+8Qc4cmEN8LJFYdddOl3LSV7WZror2xD06V42TI 6ugWLnVOGv3eCSVwBfmIGPn209LuE45uk5eU/MI8Vy9bzrpIUvxOpyB+N0WqtC+TGaQ6FZ Bx3ce5IZiVkUmgAko0UClvusvAxMyGX+mIOJxNSImOA6s7RX9/2Arorvdse7fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763242747; a=rsa-sha256; cv=none; b=iPrAcYjt6XaHVnksEk36chqThPWefo73o3hcAqBa+5q1ePF63SuyEsyscSHnfZ0gfH3fhj +1KFI6S0VQpu7TKduD4K53y1H5ShxCSelWlH7qFzjhRMYkGmi1QA12f1A8TECWXdjTEtBz +r2En8U8JrDL4A1hmUbjLutzlY+FB6yvNhmQXkY8nRLuyITr9AZXUZbBhGJ2i6IVdjufCr 0rxq3T3gqiae3lyeKkYAfzG/K6RVGwkCiwWU4FyBFuI7K70xBMmnu8HxfJAtQRP1IK/BNU EAg6VOY666TF7jQjv3YGaldlhIG0lUB9IBT31NoWTikhxVjNI93OGO6RaKCd6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d86pM5NXfz18mY; Sat, 15 Nov 2025 21:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AFLd7kK054359; Sat, 15 Nov 2025 21:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFLd7w3054356; Sat, 15 Nov 2025 21:39:07 GMT (envelope-from git) Date: Sat, 15 Nov 2025 21:39:07 GMT Message-Id: <202511152139.5AFLd7w3054356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 66f2f1c83247 - main - pf: handle divert packets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 66f2f1c83247f05a3a599d7e88c7e7efbedd16b5 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=66f2f1c83247f05a3a599d7e88c7e7efbedd16b5 commit 66f2f1c83247f05a3a599d7e88c7e7efbedd16b5 Author: Kristof Provost AuthorDate: 2025-11-15 13:44:54 +0000 Commit: Kristof Provost CommitDate: 2025-11-15 21:38:21 +0000 pf: handle divert packets In a divert setup pf_test_state() may return PF_PASS, but not set the state pointer. We didn't handle that, and as a result crashed immediately afterwards trying to dereference that NULL state pointer. Add a test case to provoke the problem. PR: 260867 MFC after: 2 weeks Submitted by: Phil Budne Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 20 ++++++++++-------- tests/sys/netpfil/pf/divert-to.sh | 43 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a39f5fe58cd6..5e919e35b07b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -11075,10 +11075,12 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 break; action = pf_test_state(&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) { /* Validate remote SYN|ACK, re-create original SYN if * valid. */ @@ -11127,10 +11129,12 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 default: action = pf_test_state(&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 ae44cd5d51af..153136199311 100644 --- a/tests/sys/netpfil/pf/divert-to.sh +++ b/tests/sys/netpfil/pf/divert-to.sh @@ -372,6 +372,47 @@ in_dn_in_div_in_out_div_out_dn_out_cleanup() pft_cleanup } +atf_test_case "pr260867" "cleanup" +pr260867_head() +{ + atf_set descr 'Test for the loop reported in PR260867' + atf_set require.user root +} + +pr260867_body() +{ + pft_init + divert_init + + epair=$(vnet_mkepair) + + 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 /usr/sbin/inetd -p ${PWD}/inetd-echo.pid $(atf_get_srcdir)/echo_inetd.conf + jexec alcatraz $(atf_get_srcdir)/../common/divapp 1001 divert-back & + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "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 + atf_fail "Did not receive echo reply" + fi +} + +pr260867_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "in_div" @@ -383,4 +424,6 @@ atf_init_test_cases() atf_add_test_case "in_div_in_fwd_out_div_out" atf_add_test_case "in_dn_in_div_in_out_div_out_dn_out" + + atf_add_test_case "pr260867" }