git: 697c1568b75a - main - pf: fix IPv6 route lookup for nat64

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=697c1568b75a0053e422782dd7c0d9d1e28a67e8

commit 697c1568b75a0053e422782dd7c0d9d1e28a67e8
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2025-01-23 09:53:55 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
CommitDate: 2025-01-23 12:53:18 +0000

    pf: fix IPv6 route lookup for nat64
    
    The route lookup in pf_route6() (for the nat64 case) had the src/dst for bcopy()
    swapped around, so any nat64 setup that passed via a gateway on the IPv6 side
    was broken.
    
    Fix this, add 'const' to make this error actually fail to compile and add a
    test case.
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/netpfil/pf/pf.c           |  6 ++---
 tests/sys/netpfil/pf/nat64.sh | 63 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 3b9c71296a2b..83eca735d2bb 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -8961,7 +8961,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp,
 
 		if (ifp == NULL && (pd->af != pd->naf)) {
 			/* We're in the AFTO case. Do a route lookup. */
-			struct nhop_object *nh;
+			const struct nhop_object *nh;
 			nh = fib4_lookup(M_GETFIB(*m), ip->ip_dst, 0, NHR_NONE, 0);
 			if (nh) {
 				ifp = nh->nh_ifp;
@@ -9220,14 +9220,14 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp,
 		}
 
 		if (ifp == NULL && (pd->af != pd->naf)) {
-			struct nhop_object *nh;
+			const struct nhop_object *nh;
 			nh = fib6_lookup(M_GETFIB(*m), &ip6->ip6_dst, 0, NHR_NONE, 0);
 			if (nh) {
 				ifp = nh->nh_ifp;
 
 				/* Use the gateway if needed. */
 				if (nh->nh_flags & NHF_GATEWAY)
-					bcopy(&dst.sin6_addr, &nh->gw6_sa.sin6_addr,
+					bcopy(&nh->gw6_sa.sin6_addr, &dst.sin6_addr,
 					    sizeof(dst.sin6_addr));
 				else
 					dst.sin6_addr = ip6->ip6_dst;
diff --git a/tests/sys/netpfil/pf/nat64.sh b/tests/sys/netpfil/pf/nat64.sh
index 79fa0c99a311..913f90480e5d 100644
--- a/tests/sys/netpfil/pf/nat64.sh
+++ b/tests/sys/netpfil/pf/nat64.sh
@@ -609,6 +609,68 @@ dummynet_cleanup()
 	pft_cleanup
 }
 
+atf_test_case "gateway6" "cleanup"
+gateway6_head()
+{
+	atf_set descr 'NAT64 with a routing hop on the v6 side'
+	atf_set require.user root
+}
+
+gateway6_body()
+{
+	pft_init
+
+	epair_lan_link=$(vnet_mkepair)
+	epair_link=$(vnet_mkepair)
+	epair=$(vnet_mkepair)
+
+	ifconfig ${epair}a inet6 2001:db8:1::2/64 up no_dad
+	route -6 add default 2001:db8:1::1
+
+	vnet_mkjail lan_rtr ${epair}b ${epair_lan_link}a
+	jexec lan_rtr ifconfig ${epair}b inet6 2001:db8:1::1/64 up no_dad
+	jexec lan_rtr ifconfig ${epair_lan_link}a inet6 2001:db8::2/64 up no_dad
+	jexec lan_rtr route -6 add default 2001:db8::1
+	jexec lan_rtr sysctl net.inet6.ip6.forwarding=1
+
+	vnet_mkjail rtr ${epair_lan_link}b ${epair_link}a
+	jexec rtr ifconfig ${epair_lan_link}b inet6 2001:db8::1/64 up no_dad
+	jexec rtr ifconfig ${epair_link}a 192.0.2.1/24 up
+	jexec rtr route -6 add default 2001:db8::2
+
+	vnet_mkjail dst ${epair_link}b
+	jexec dst ifconfig ${epair_link}b 192.0.2.2/24 up
+	jexec dst route add default 192.0.2.1
+
+	# Sanity checks
+	atf_check -s exit:0 -o ignore \
+	    ping6 -c 1 2001:db8:1::1
+	atf_check -s exit:0 -o ignore \
+	    ping6 -c 1 2001:db8::1
+	atf_check -s exit:0 -o ignore \
+	    jexec dst ping -c 1 192.0.2.1
+
+	jexec rtr pfctl -e
+	pft_set_rules rtr \
+	    "set reassemble yes" \
+	    "set state-policy if-bound" \
+	    "pass in on ${epair_lan_link}b inet6 from any to 64:ff9b::/96 af-to inet from (${epair_link}a)"
+
+	# One ping
+	atf_check -s exit:0 -o ignore \
+	    ping6 -c 1 64:ff9b::192.0.2.2
+
+	# Make sure packets make it even when state is established
+	atf_check -s exit:0 \
+	    -o match:'5 packets transmitted, 5 packets received, 0.0% packet loss' \
+	    ping6 -c 5 64:ff9b::192.0.2.2
+}
+
+gateway6_cleanup()
+{
+	pft_cleanup
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case "icmp_echo"
@@ -624,4 +686,5 @@ atf_init_test_cases()
 	atf_add_test_case "table_range"
 	atf_add_test_case "table_round_robin"
 	atf_add_test_case "dummynet"
+	atf_add_test_case "gateway6"
 }