From nobody Fri Nov 28 20:37:12 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 4dJ4q13vR1z6JFBS for ; Fri, 28 Nov 2025 20:37:17 +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 4dJ4pw2nmWz3ZGy for ; Fri, 28 Nov 2025 20:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764362232; 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=1041ihqDZRthqOCSmMoXoKZQVrkCD+/5jig4Rp8Nhls=; b=UBmYkyoGd8WdDQbxREqyaMBkfH9Qa7rHI5HzMSB2gwLfWZ+kfOT6/FLF/MryAbkTBSJSNJ N8GouBlgDoUrcR6qhUDDk7wEtI6ZPTllFqNlvE49FYNaK375aw/tR/zKcR/Io+Jr7ITkWK zrXJY9Trve+EURQzT57NsmbLb4tehJJID25kRaou1Ft5QkNwQpSmObmDUuMhPeZO2pRpk8 7Kz1bcsratbdNF8zVEQLSJnz785LOLgn5jjgg3ZShuP7GU04US1MpHlXQ3GW+Usfpymeod 2YWqoXY8knqi1bzD419eVGFTFDxrS+8gihT9gc91FRvG3y3Nl1BGu/A7+0gfrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764362232; 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=1041ihqDZRthqOCSmMoXoKZQVrkCD+/5jig4Rp8Nhls=; b=fd+XKULgMWT6Evlj3FJrx/ZBNho+jLiW0jixMXCGmbC+K3GA6V0C073p1rJLCK7e7ZJucW s9KxDoZ1NDkGe0Thjvyv0PdXOA0/UmIukYc0zMlbtrRQNa/wjKaOlcZUa1tZa3g2zNIJ+E uTx2Hw0CY7/F6gfYoAJeM9RH8HHGdT+c0aQF5wTdAeTX5jnZwQbfi4+UtCl3WCCNtknnvI 59HPT6+yp8ekiWoNOQcCLz27JkqvMsaab+qztG4LzYMfY95vnqHYSlA3baehASxckkEi/+ VeVzyrdrYbeaJuHt5g6uOzVnIqc1pbMW1BUEB5kwPJpAX2u1ZkML7CWDahUJVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764362232; a=rsa-sha256; cv=none; b=muJNuk2mEzfgmTNTmPwgujjARsZeOA9k1KQG6yzu/Q73eylBDvUv5fjJl5VLSyMBR0nbBj qp9p653NRz3vjFE+2oxFTO39LGuDeeJOcQPBj8BT5WTwUjZcWBWDmOFeRdfzkxgU2lq5R3 ePixrqcuWO5UTagcrlra+ZM241jVZDYz3fE1irjGzA/pDjTSAKH6CIPGW/4fba6thp98XY 7amADH6eOrTLuaE/IFOjjApRcPkFEbUQYvntva9rRELzHfqYp3I2dii6XtbifC8QhRuXh8 1bNYVnBrs9//g+QxEO2mpbuhBALrvSbmColaWshDH3ojglVv0nFwxakKeKEQ1A== 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 4dJ4pw2LDKz2wF for ; Fri, 28 Nov 2025 20:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2da36 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 20:37:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 6da01ce6d36f - stable/15 - pf: fix another endpoint-independent crash 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: 6da01ce6d36f6b0cc781894d49bff93bf0d9c881 Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 20:37:12 +0000 Message-Id: <692a07f8.2da36.834a69b@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6da01ce6d36f6b0cc781894d49bff93bf0d9c881 commit 6da01ce6d36f6b0cc781894d49bff93bf0d9c881 Author: Kristof Provost AuthorDate: 2025-11-21 09:03:36 +0000 Commit: Kristof Provost CommitDate: 2025-11-28 20:33:47 +0000 pf: fix another endpoint-independent crash In c12013f5bb38 we fixed udp_mapping cleanup issues in pf_get_sport(), but missed the static-port case (i.e. low == 0 && high == 0). We could still exit pf_get_sport() without either inserting the udp_mapping or freeing it. Address this and add a test case to provoke the problem. Reviewed by: thj MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D53856 (cherry picked from commit 7dedc3c21436bb5a1220f8901992d2772a163f78) --- sys/netpfil/pf/pf_lb.c | 16 ++++++++++++---- tests/sys/netpfil/pf/nat.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index c6cdc4e03f3e..beffdcd017b4 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -407,10 +407,18 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, */ key.port[sidx] = pd->nsport; if (!pf_find_state_all_exists(&key, dir)) { - MPASS(udp_mapping == NULL || - *udp_mapping == NULL); - *nport = pd->nsport; - return (0); + if (udp_mapping && *udp_mapping != NULL) { + (*udp_mapping)->endpoints[1].port = pd->nsport; + if (pf_udp_mapping_insert(*udp_mapping) == 0) { + *nport = pd->nsport; + return (0); + } + } else { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); + *nport = pd->nsport; + return (0); + } } } else if (low == high) { key.port[sidx] = htons(low); diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 7d5db6743424..71af0f31d174 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -286,6 +286,35 @@ endpoint_independent_exhaust_cleanup() rm -f server2.out } +atf_test_case "endpoint_independent_static_port" "cleanup" +endpoint_independent_static_port_head() +{ + atf_set descr 'Test that a client behind NAT gets the same external IP:port for different servers, with static-port' + atf_set require.user root +} + +endpoint_independent_static_port_body() +{ + endpoint_independent_setup # Sets ${epair_…} variables + + endpoint_independent_common \ + "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a)" \ + "nat on ${epair_nat}a inet from ! (${epair_nat}a) to any -> (${epair_nat}a) static-port sticky-address endpoint-independent" + + # Exhaust the available nat ports + for i in $(seq 1 10); do + echo "ping" | jexec client nc -u 198.51.100.32 1234 -w 0 + echo "ping" | jexec client nc -u 198.51.100.22 1234 -w 0 + done +} + +endpoint_independent_static_port_cleanup() +{ + pft_cleanup + rm -f server1.out + rm -f server2.out +} + atf_test_case "endpoint_independent_pass" "cleanup" endpoint_independent_pass_head() { @@ -881,6 +910,7 @@ atf_init_test_cases() atf_add_test_case "nested_anchor" atf_add_test_case "endpoint_independent_compat" atf_add_test_case "endpoint_independent_exhaust" + atf_add_test_case "endpoint_independent_static_port" atf_add_test_case "endpoint_independent_pass" atf_add_test_case "nat6_nolinklocal" atf_add_test_case "empty_table_source_hash"