From nobody Sun Nov 30 10:30:53 2025 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 4dK3GP4klMz6J7RY for ; Sun, 30 Nov 2025 10:30:53 +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 4dK3GP30cYz3fXH for ; Sun, 30 Nov 2025 10:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764498653; 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=9D4COp3mrSjPT8fsKno0oQa/kc92C0Y0K/qdr57WzUw=; b=Ml+0lur2yJWfe1BFm1HkpelLEYsCw/Ay9+dP4M9Gekdhv7US48dU4UJLcqWK2lv8fzg1DG 9+6u6m69CLhKFAyusjUXmG+aE7Ye2FcQyzGKGEMZhH+86lGU7o6LCNY0WOWaUuRiphsv6+ PUt7ytcUurumzhhj58Mi179PKmG9YJVncAYwUSBgQZlKPjplfsw3lGEdUNpxXt86WrAJQq sODeifBd9lctPMEOtoQSrnC3UeHROAsntFBjB6GKi7JJMVV2O/T8hrTr9iVIJbZqaBb++H 4n9uZewmJbSz+hqY2sOAYKzFEw61hVdxWrgJF9DO40qDjSQ/6FKMZ6unRWhpqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764498653; 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=9D4COp3mrSjPT8fsKno0oQa/kc92C0Y0K/qdr57WzUw=; b=P1hbcnIKZ1mqF07JRHExDnXcDGgVtLmwBZyl92Ey/skFJZL3HeUCRUAbu5pc33i4Sljb63 t6r33yh41BqjD6JUKK3LnXahK28a5WG1mEqX+hUATFRfYMm/dJgwcCPVp6y2YTRqiWX/0k JfJrMxhBS3Ll28Awz6ha2YJiVxrUtgFAfUA6h3PRLLrInWqbG2abFvoh5+cRIRCuwSJmng 2iuw5QOl9o4MX+iZ6ccz46mG+VftHNB8jn4UWpVmsOJOKDiwGVrzKw8smAMjmJrdQ+/huE zP76/8N6l6pSXhY5Z1KDL5zqQeI5jWR/fQgkHFdSwqAk85m57YXl8f19tj1/XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764498653; a=rsa-sha256; cv=none; b=GYq6e1lHBjUmhyk6gQQ7FspNT6JIxYYyIMqCvn0hm548l3cy/kp6LzY01ge8Fqq1Dm9T+X esyHsWEXKsYAIG6vzTbLWbMb4EMGY+ZRTl3RUXLJ0P5T9JIsvwuyRGGGpnsvtVjjCGfEMw HFRy+L3Hjti2cnK9WICkByoGRu0ajnZM5uF6TT/0nXpJk7LgMBjIrhAmL3soG+1wUZ/dw8 wPyQ7f2da5Nl0P99dTCdx9KoKp7ogvdlCrOadN4UK3qLtfytbPmHwrUCyLDbA7H8mfNjUf rOYXwsN9I2K5doCJ+4jYGYerPvpy0Gr7V+giV3LHhcOcI4BUOl4b7pgmZ1ubmA== 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 4dK3GP2WBpzXPK for ; Sun, 30 Nov 2025 10:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36c69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Nov 2025 10:30:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: a009793a5e5f - stable/14 - pf: handle divert packets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: a009793a5e5fad0b42cb0a158dcbccd5eff40d9f Auto-Submitted: auto-generated Date: Sun, 30 Nov 2025 10:30:53 +0000 Message-Id: <692c1cdd.36c69.3cf5cd41@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a009793a5e5fad0b42cb0a158dcbccd5eff40d9f commit a009793a5e5fad0b42cb0a158dcbccd5eff40d9f Author: Kristof Provost AuthorDate: 2025-11-15 13:44:54 +0000 Commit: Kristof Provost CommitDate: 2025-11-30 10:26:28 +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") (cherry picked from commit 66f2f1c83247f05a3a599d7e88c7e7efbedd16b5) --- sys/netpfil/pf/pf.c | 20 +++++++++++------- tests/sys/netpfil/pf/divert-to.sh | 44 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index f067c2b6bdf4..44d72d228104 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8558,10 +8558,12 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, goto done; action = pf_test_state_tcp(&s, kif, m, off, h, &pd, &reason); if (action == PF_PASS) { - if (V_pfsync_update_state_ptr != NULL) - V_pfsync_update_state_ptr(s); - r = s->rule.ptr; - a = s->anchor.ptr; + if (s != NULL) { + if (V_pfsync_update_state_ptr != NULL) + V_pfsync_update_state_ptr(s); + r = s->rule.ptr; + a = s->anchor.ptr; + } } else if (s == NULL) { /* Validate remote SYN|ACK, re-create original SYN if * valid. */ @@ -8621,10 +8623,12 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, } action = pf_test_state_udp(&s, kif, m, off, h, &pd); if (action == PF_PASS) { - if (V_pfsync_update_state_ptr != NULL) - V_pfsync_update_state_ptr(s); - r = s->rule.ptr; - a = s->anchor.ptr; + if (s != NULL) { + if (V_pfsync_update_state_ptr != NULL) + V_pfsync_update_state_ptr(s); + r = s->rule.ptr; + a = s->anchor.ptr; + } } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh index 965464b35810..8c76ffd35bfe 100644 --- a/tests/sys/netpfil/pf/divert-to.sh +++ b/tests/sys/netpfil/pf/divert-to.sh @@ -509,6 +509,47 @@ ipfwon_in_dn_in_div_in_out_dn_out_div_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 "ipfwoff_in_div" @@ -524,6 +565,5 @@ atf_init_test_cases() atf_add_test_case "ipfwoff_in_div_in_fwd_out_div_out" atf_add_test_case "ipfwon_in_div_in_fwd_out_div_out" - atf_add_test_case "ipfwoff_in_dn_in_div_in_out_dn_out_div_out" - atf_add_test_case "ipfwon_in_dn_in_div_in_out_dn_out_div_out" + atf_add_test_case "pr260867" }