From nobody Sun Oct 19 21:08:05 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 4cqWP14H5Yz6CY2R; Sun, 19 Oct 2025 21:08:05 +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 4cqWP13TbBz3RF8; Sun, 19 Oct 2025 21:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760908085; 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=eYOyD1Usz9fSVuUTPiCQSKtdWzfgOLsXkZR+zfS1PdU=; b=iIFoUSFtlVp87bqPUL3nhgFs0DXsMdAsFYlk/0I0tkACsGXv/WDCeLF1Tln8DFKDUwv5PM Tob/B0g5auqiTQE9OY7lu+V/ml6ngIDqAExWUO0tc/J60ZrDw/zSt5LXUSvKPbZiQC38IA G93yzNGxOMVa7a1ZD6xGVEWmTOOZrUhg2HG7a3p+5j64LxXkBmnHl9UYBdmtPSiRsMYjHV 9Gsc9ln+fe7t1ZF40rwBYQN2fPzIlup2oMgsopM5vZmhAAW5gyNHJADtSxvn/EznrahQ+o os8A8mws/liI4o4Qv2kTewMvCH9un2uxUggqSjD/fCa75rHF6cLI183LpXhe8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760908085; 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=eYOyD1Usz9fSVuUTPiCQSKtdWzfgOLsXkZR+zfS1PdU=; b=TD+vsgA79FUjlyLkNMBt2K3A9dCIA4Jv8NBOG467ahqWlpu1e1oBudFuFvT/JGToz0qq27 XYt/updyilDE9MnmAuOwnq+hH9ZTWDt5UtWv5xJEui6wn/1c5OIPI7svLRuur7XRFjEudT jAFAQQ16y8xUCxZ3ObvpC7VDCRmEujnKbnYXHe1+YGDHDs6wwDrt0LtWfUhlk7+wqYURim o+AqOsMISfQgIIAnxSWn0cQCid63kX9ijjOgc7+YJwkXZqGetMB5UKRb3qK4WIEJ+d9A9F P6DJRjuAPU7Sur0P6+ldBohlZwcbixGYv16wl+Vz1hVvKktQRFWgVa40IrYPmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760908085; a=rsa-sha256; cv=none; b=MA2xDlRYtsrp9VdP37gsjNkGOoB7odSiy4RV4bTkI7HvHP8HO7rV66pM7CZtQfBmsdxz23 nnocotDctYHalREiV4BOjeBVpj/jdFvgvDoo7GiGazEu3ToxiazjQV59wnJB5jb6+HqDoa 4WzutBQB4arlSGk1TY+RcjwgirT3XaXEd10I1B3TlUHwZj65gRBOq7fZDY+0OxG4YWa4gW 23XbzL2JpxmCeaXLfsEcLKeJuc7KohXTXzfRQ7PfqZACD9qqIGrEbbwi6PwCLtkkdy86sr ncsGkTbZ4IkI9qFD6ODHJQNoeqGhH/eHmtJnvB4AgEfqDvRMPZgy64/Y7K7sOw== 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 4cqWP133rczl4W; Sun, 19 Oct 2025 21:08:05 +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 59JL85q8073729; Sun, 19 Oct 2025 21:08:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59JL85K3073726; Sun, 19 Oct 2025 21:08:05 GMT (envelope-from git) Date: Sun, 19 Oct 2025 21:08:05 GMT Message-Id: <202510192108.59JL85K3073726@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: cb36bfee25b7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: cb36bfee25b71d1223b8fb1237fcf823d514b50e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=cb36bfee25b71d1223b8fb1237fcf823d514b50e commit cb36bfee25b71d1223b8fb1237fcf823d514b50e Author: Kristof Provost AuthorDate: 2025-10-18 15:47:47 +0000 Commit: Kristof Provost CommitDate: 2025-10-19 21:07:43 +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 --- 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 d6fc24a23fe9..fd70fb1c8a36 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5965,6 +5965,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 fb1b121d0bc0..5d85e16f18e3 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" }