From nobody Wed Oct 22 19:07:58 2025 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 4csJb2744Wz6D9Dy; Wed, 22 Oct 2025 19:07:58 +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 4csJb26MlFz47lK; Wed, 22 Oct 2025 19:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761160078; 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=1vxINWvVY5nJ4xl/tDW1ibfOmd8Ff3ZcFLk6t6xZgUs=; b=wF5fetjH1ucMgpAeF8AXXA3tBk4pm5YP2Ra7kD7VK29C4Qniyh2urnFVd2CXgjlTOy/xWY 7CjwzvZHCiI1CKAkZyYDgcVDyL2G8lmQD9Rm1mhyvUp1GxvdmjEdAqIyDfn0mhvNoiUiKk GDVrdqKZibDTK4zu5yxGeXeDtC8hWGs7a3kp0qMzSpnfICq+ETgPzK9FX4+o0qvdCd3kjV siwFplP7Mv5tu9Nkflp+4lNymqA22rz4Zlu2HFiqas2B0Io/1qjQUXiQQ3o+PBEtn7TfSi FQIuQyNvsNKXwYgz+9Og1WqyBnsFJm2T+g3KDqTm7fWkQ9RH2ZKVx5UiCKRrzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761160078; 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=1vxINWvVY5nJ4xl/tDW1ibfOmd8Ff3ZcFLk6t6xZgUs=; b=D7g9yaJrNijr3Y9NtSFdbEqgshpTVL0KxH/n8NudMyk4ISqxqupfhZIPFIOHirUAiQ8+yg LotozHRaq8ucyGPfarR2MVut8PMlKh1bNEMC5aUSecA8gwr5+WstK38FT2RYLVFmrcxu+z UWDi+yfWzxLyKZN/Gl0m4dZUmknFNoiedH+WY6VgtwW2xxZU+CcDji3Sks+TyHvaApCef9 ZZ3yx0cuSv/YZx8iLNHGfVFbjm/m1wKO6tf+03S53eRIfe3wXSkNlT3oLmJrf0JH5efu26 qW7T03z+WMB17wdt49Z5vSo9MDIpBYBy4JuWzBWfvWD6B0nEKMfyuOnfsGxtqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761160078; a=rsa-sha256; cv=none; b=QayS41qBCnnqHrvN0TXdMj/5PnmYqC7cL4Ik1fq3mpnaiVlH0uBWxAIy1JHkHAlgXfWSkk jSJw4w/lA8MSA/wyRACFGMnPJUY+TveSltgpoljITzSdZNvU3P1aaLmDUm/faBKUGwIqPi //SlsGd1PlLucEPFTYUCdlkAboQtzZJlzaKinoWyVnAgwx9rmaJgd7HeJkJCBHXJZvZuPt Jlmd1tWdf91N5dN0glQzzuI5xX9WPGgzXKrf9niVBb/+Dh6midduB0kGJZDeqDJC/NqL7i SZ0Pgv5JmgKtomr0CdtybosEiWdAr9YZrZr9rdTfmk0VtQo79zib8sZ4E2edqA== 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 4csJb25hkTzgxR; Wed, 22 Oct 2025 19:07:58 +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 59MJ7wOJ001984; Wed, 22 Oct 2025 19:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MJ7w6N001981; Wed, 22 Oct 2025 19:07:58 GMT (envelope-from git) Date: Wed, 22 Oct 2025 19:07:58 GMT Message-Id: <202510221907.59MJ7w6N001981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 536b07512c4b - stable/15 - pf: fix 'no rdr' 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 536b07512c4b931b9d0d3d609c3ac925f55e3ec9 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=536b07512c4b931b9d0d3d609c3ac925f55e3ec9 commit 536b07512c4b931b9d0d3d609c3ac925f55e3ec9 Author: Kristof Provost AuthorDate: 2025-10-18 15:47:47 +0000 Commit: Kristof Provost CommitDate: 2025-10-22 19:02:14 +0000 pf: fix 'no rdr' Ensure we always have a non-NULL rule pointer (ctx.rm). It might have gotten set to NULL by pf_get_translation(). While here also restore the previous rdr behaviour be re-adding the incorrectly removed 'break' in pf_match_translation_rule. PR: 290177 MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D53191 (cherry picked from commit cb36bfee25b71d1223b8fb1237fcf823d514b50e) --- sys/netpfil/pf/pf.c | 1 + sys/netpfil/pf/pf_lb.c | 1 + tests/sys/netpfil/pf/rdr.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8d3d72148815..af0629397ea0 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5939,6 +5939,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, ctx.nat_pool = &(ctx.nr->rdr); } + *ctx.rm = &V_pf_default_rule; if (ctx.nr && ctx.nr->natpass) { r = ctx.nr; ruleset = *ctx.rsm; diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index b8b5157c9b15..29d7a32e0bdc 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -216,6 +216,7 @@ pf_match_translation_rule(int rs_num, struct pf_test_ctx *ctx, struct pf_krulese */ ctx->arsm = ctx->aruleset; } + break; } else { ctx->a = r; /* remember anchor */ ctx->aruleset = ruleset; /* and its ruleset */ diff --git a/tests/sys/netpfil/pf/rdr.sh b/tests/sys/netpfil/pf/rdr.sh index 24b95b2047f4..b0f0e6d13d0f 100644 --- a/tests/sys/netpfil/pf/rdr.sh +++ b/tests/sys/netpfil/pf/rdr.sh @@ -338,6 +338,56 @@ natpass_cleanup() pft_cleanup } +atf_test_case "pr290177" "cleanup" +pr290177_head() +{ + atf_set descr 'Test PR290177' + atf_set require.user root +} + +pr290177_body() +{ + pft_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}a 192.0.2.2/24 up + ifconfig ${epair}a inet alias 192.0.2.3/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up + jexec alcatraz ifconfig lo0 127.0.0.1/8 up + + # Sanity check + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.1 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "table { 192.0.2.2 }" \ + "no rdr inet proto tcp from to any port 25" \ + "rdr pass inet proto tcp from any to any port 25 -> 127.0.0.1 port 2500" + + echo foo | jexec alcatraz nc -N -l 2500 & + sleep 1 + + reply=$(nc -w 3 -s 192.0.2.2 192.0.2.1 25) + if [ "${reply}" == "foo" ] + then + atf_fail "no rdr rule failed" + fi + reply=$(nc -w 3 -s 192.0.2.3 192.0.2.1 25) + if [ "${reply}" != "foo" ] + then + atf_fail "rdr rule failed" + fi +} + +pr290177_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "natpass" @@ -345,4 +395,5 @@ atf_init_test_cases() atf_add_test_case "tcp_v6_pass" atf_add_test_case "srcport_compat" atf_add_test_case "srcport_pass" + atf_add_test_case "pr290177" }