From nobody Sun Sep 28 17:25:43 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 4cZWS727xHz6910h; Sun, 28 Sep 2025 17:25:43 +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 4cZWS71L8Zz42JL; Sun, 28 Sep 2025 17:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759080343; 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=X9knVI46udT0cqDZNHuanoLvFa+wi8E4sczcGq+LMKM=; b=YAqQX1yIqvcFwTN3/H8hggGB0UNNBX1bx4b61xu+big5YcI64ljb3XdK7555b0x5H4z+p3 o1XtUOg/lxaY+JZCJnkPxIpIIxhd/g+d7ayVNIwaxiHPN+2fNBnuJ7rweSE8EaYLX3JrjH 4fG/hyZUox6TpVkMp+sxibyLmcE1UWNvuxIfhrbfsf79Ew/TW7+YzrvV+TCnkDLcOKVKwS bBBECE4i+h7jIYEFYyYB3J2FQ6luvLmrVrfY651V97CVv8mS2Z3jrHGXGEnY1S7Rbk12P4 WQrO6XK/8u7ao8gIDimAPaYNjhZ5QDXGfn57xR2oa52R6j3J23X0loMWLQpEBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759080343; 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=X9knVI46udT0cqDZNHuanoLvFa+wi8E4sczcGq+LMKM=; b=ZYPVA2bjQh09uoxvGBMv6O35Y66ADb55WYpViVsfkdU1lO2kySWSdQqKUKtn2HHHZhGF48 wzl1kFliAN2IwBPhJ4RkiPYlAEnSyrSYaiitLuKpH+7Ym8ppnfqHLMkrSj+kk9tYIM5cFD oKTFTv/kuQOGp8qgXPDVyZ7Q3GW/kvVOP5N2xZOb1cAfwEOEqumkQi9er1nyPTR8+j54Gr Ty1/lzIfKQVB59Ayq1GpiuT2G67dpXTjSF7Dv96f9q1RiKo41DjhBgAHtXfzte1W8EsXXl XBfnXBmbSxc2NMNdJCxrR738JjWwLnokxQ0tvvPBb6ciPCEqLwrxKIheScZ2xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759080343; a=rsa-sha256; cv=none; b=Nb+38ZrUUXyX5GpzV+RwpWk3UWssQfYUlyoOYI0ufRlRLPvAC1oQtEc6EOvFgq9/IzpNy8 ihf2sA4eskTdfDRiKjaIM3GMJivzIkLkkCaNH9AytNm9kbEPo7rgTqcxod1T9xwJNqcWQx zrftTQuYY1vlsGBzrnqP63kzjyB6TSMbMw9opzOQ3MXe/JLaG3ZtReXYyrCaX8erOZNBBc WzYmmEPYBZVkunxVPsT0UPK5g8lGju5/+3LJxUSZgApfapCGjq0T6fFLJtUYde1jJ6rLRY 4yLk8HVv0DW6s/XQWoPv87nD213JwXjZSjbLgGXuJD7N7QJ0EjxoN80fgduybg== 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 4cZWS70sC7zTJ5; Sun, 28 Sep 2025 17:25:43 +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 58SHPhga027366; Sun, 28 Sep 2025 17:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58SHPhPb027363; Sun, 28 Sep 2025 17:25:43 GMT (envelope-from git) Date: Sun, 28 Sep 2025 17:25:43 GMT Message-Id: <202509281725.58SHPhPb027363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kajetan Staszkiewicz Subject: git: 938ae26ffda8 - main - pf: Always skip outbound filtering for inbound af-to rules 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: ks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 938ae26ffda81fd42c235eaa3223dae51331e4eb Auto-Submitted: auto-generated The branch main has been updated by ks: URL: https://cgit.FreeBSD.org/src/commit/?id=938ae26ffda81fd42c235eaa3223dae51331e4eb commit 938ae26ffda81fd42c235eaa3223dae51331e4eb Author: Kajetan Staszkiewicz AuthorDate: 2025-09-07 13:59:00 +0000 Commit: Kajetan Staszkiewicz CommitDate: 2025-09-28 17:23:01 +0000 pf: Always skip outbound filtering for inbound af-to rules The af-to rules on inbound direction create a single state spanning both the inbound and the outbound interface. Calling pf_test() for the outbound direction in pf_route() makes the packet pass through state search, match the existing state, never evaluate the ruleset, and increase state counters. Check that the state comes from an af-to rule in inbound direction, and if yes, skip outbound testing. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D52446 --- sys/netpfil/pf/pf.c | 4 ++-- tests/sys/netpfil/pf/nat64.sh | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ec6960180413..f50599627255 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -9221,7 +9221,7 @@ pf_route(struct pf_krule *r, struct ifnet *oifp, } } - if (r->rt == PF_DUPTO) + if (r->rt == PF_DUPTO || (pd->af != pd->naf && s->direction == PF_IN)) skip_test = true; if (pd->dir == PF_IN && !skip_test) { @@ -9538,7 +9538,7 @@ pf_route6(struct pf_krule *r, struct ifnet *oifp, } } - if (r->rt == PF_DUPTO) + if (r->rt == PF_DUPTO || (pd->af != pd->naf && s->direction == PF_IN)) skip_test = true; if (pd->dir == PF_IN && !skip_test) { diff --git a/tests/sys/netpfil/pf/nat64.sh b/tests/sys/netpfil/pf/nat64.sh index d930e2ee5763..d873d34a51d5 100644 --- a/tests/sys/netpfil/pf/nat64.sh +++ b/tests/sys/netpfil/pf/nat64.sh @@ -214,11 +214,11 @@ tcp_in_if_bound_body() fi # Interfaces of the state are reversed when doing inbound NAT64! - # FIXME: Packets counters seem wrong! + # FIXME: Packets from both directions are counted only on the inbound direction! states=$(mktemp) || exit 1 jexec rtr pfctl -qvvss | normalize_pfctl_s > $states for state_regexp in \ - "${epair_link}a tcp 192.0.2.1:[0-9]+ \(2001:db8::2\[[0-9]+\]\) -> 192.0.2.2:1234 \(64:ff9b::c000:202\[1234\]\) .* 9:9 pkts.* rule 3 .* origif: ${epair}b" \ + "${epair_link}a tcp 192.0.2.1:[0-9]+ \(2001:db8::2\[[0-9]+\]\) -> 192.0.2.2:1234 \(64:ff9b::c000:202\[1234\]\) .* 9:0 pkts.* rule 3 .* origif: ${epair}b" \ ; do grep -qE "${state_regexp}" $states || atf_fail "State not found for '${state_regexp}'" done @@ -296,11 +296,11 @@ tcp_in_floating_body() fi # Interfaces of the state are reversed when doing inbound NAT64! - # FIXME: Packets counters seem wrong! + # FIXME: Packets from both directions are counted only on the inbound direction! states=$(mktemp) || exit 1 jexec rtr pfctl -qvvss | normalize_pfctl_s > $states for state_regexp in \ - "all tcp 192.0.2.1:[0-9]+ \(2001:db8::2\[[0-9]+\]\) -> 192.0.2.2:1234 \(64:ff9b::c000:202\[1234\]\).* 9:9 pkts.* rule 3 .* origif: ${epair}b" \ + "all tcp 192.0.2.1:[0-9]+ \(2001:db8::2\[[0-9]+\]\) -> 192.0.2.2:1234 \(64:ff9b::c000:202\[1234\]\).* 9:0 pkts.* rule 3 .* origif: ${epair}b" \ ; do grep -qE "${state_regexp}" $states || atf_fail "State not found for '${state_regexp}'" done @@ -1045,8 +1045,10 @@ route_to_body() states=$(mktemp) || exit 1 jexec rtr pfctl -qvvss | normalize_pfctl_s > $states + # Interfaces of the state are reversed when doing inbound NAT64! + # FIXME: Packets from both directions are counted only on the inbound direction! for state_regexp in \ - "${epair_link}a ipv6-icmp 192.0.2.1:.* \(2001:db8::2\[[0-9]+\]\) -> 192.0.2.2:8 \(64:ff9b::c000:202\[[0-9]+\]\).*6:6 pkts.*route-to: 192.0.2.2@${epair_link}a origif: ${epair}b" \ + "${epair_link}a ipv6-icmp 192.0.2.1:.* \(2001:db8::2\[[0-9]+\]\) -> 192.0.2.2:8 \(64:ff9b::c000:202\[[0-9]+\]\).* 6:0 pkts.*route-to: 192.0.2.2@${epair_link}a origif: ${epair}b" \ ; do grep -qE "${state_regexp}" $states || atf_fail "State not found for '${state_regexp}'" done