From nobody Tue Nov 25 09:49:28 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 4dFyZw4HdTz6HsjP for ; Tue, 25 Nov 2025 09:49:28 +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 4dFyZw27k2z457n for ; Tue, 25 Nov 2025 09:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764064168; 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=FCCN+Q8tYmhnzUkKEQrzjl1AiDUf6sGWY2j9eppcmxk=; b=RmRte5SekPk2D56C6/CiqPXNeXgNCnTYwxqBmTKXuCCL9Y3UWe1hZcfv3A9jOOR8spswqc 3kbUfl+1od9qZC3Y171uWGWrHsO07UsLMYz9SmMZyMcOf45EF4mL2HLbiR/PXAb4m1reM2 W9P7zNjQHJqRGHjxhy8Oi9RsnCpb46GMzFPsaasxYwEtFZm5O1mn61CuIzhE9G9nJoQSgt DtrwIffcbihi97dxFYcEPIWi2HIeX+kvfGgQTn/traxhpK+Vb5GqttyanCUeYGyeQkhbfG Xj9HFLNvnGDlEV+qkIuYyLBw/GPp92oQwF2sK9JU/k6otl1Iw1G93m6BUSyoBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764064168; 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=FCCN+Q8tYmhnzUkKEQrzjl1AiDUf6sGWY2j9eppcmxk=; b=T0wZcCvUbCvuxAcwTNKfOyRS80zRiEK/0U3mstrMyDc3Sh8v8kqKF838XAr4tysSP7J7d6 Pvtx4uLzFCS5wH6rQ9NHAiAsvMX5MtTE6J9UTHdudRxgISTFFutbTV6RM7rTpI9ITgoX9S j/cU3Wp9ZLpmwmngMzZWriabyzZIV5lioyz067PjAmb2ZzUYv2XWOVmGg7gVZHOsobFrUy RHtPli7l94/cVf5859YkQebAcrhS0xOCvuThHfFW3ICZAZjYovJS2au/WqMx0ulskJqNLQ 8+jVzd4SWzQVaI+3wMPmeYADNT3o7OBvJFiRewPauN4wMhPpGUWyitjEzSSCNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764064168; a=rsa-sha256; cv=none; b=sIYdVzRIaXIv25YazpAeH6eUMLjxNPbgDN3N7dEcwWXu3j3FAKdAjQibJ/9JiTXI0AHjzp 7o0Cjrm3wt4HhRL/NlyWgEd9mvFd3JwG2Patv1J9MAWkcSGyow+pkUbmBAfrXwwCU/RSkN Dm6d4Xw7ZvxR4fL2CfxOpjWF2lwSHbnMU5cOO8+PhHgsbDs6inyqKPZShLg9Kerj1imWO1 rW8JntdQ40TW8CNMWZ58Fob+Cr9Bi9NWx4mTyuYfPhWbccqM3JGOBPpikX8SYQ7BsInEgc yiJmstLtWO1JsI/q/eAO2MXcpeSUe87pj9zuIjXyupChgo6uEl193JdTUOBo3g== 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 4dFyZw1bbnzw05 for ; Tue, 25 Nov 2025 09:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31a70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 09:49:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 870a7a949bf9 - stable/15 - pf: fix udp_mapping cleanup 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: 870a7a949bf986e63cecc305bab90e7e8bfc0ccd Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 09:49:28 +0000 Message-Id: <69257ba8.31a70.7263aa6@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=870a7a949bf986e63cecc305bab90e7e8bfc0ccd commit 870a7a949bf986e63cecc305bab90e7e8bfc0ccd Author: Kristof Provost AuthorDate: 2025-11-13 13:54:54 +0000 Commit: Kristof Provost CommitDate: 2025-11-25 09:39:24 +0000 pf: fix udp_mapping cleanup If we fail to obtain a new source port (pf_get_sport()) while we've created a udp_mapping (for 'endpoint independent nat') we must free the udp_mapping in pf_get_sport(). Otherwise the calling function will call pf_udp_mapping_release(). This will then attempt to remove the udp_mapping from a list it's not in, and crash. Actually free the udp_mapping in all failure cases. While here sprinkle in a few more assertions to ensure we don't forget leak udp_mappings and add a test case to provoke this problem. Reviewed by: thj MFC after: 1 week See also: https://redmine.pfsense.org/issues/16517 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D53737 (cherry picked from commit c12013f5bb3819e64499f02ecd199a635003c7ce) --- sys/netpfil/pf/pf_lb.c | 29 ++++++++++++++++++++++------- tests/sys/netpfil/pf/nat.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index bee9f4637091..c6cdc4e03f3e 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -301,9 +301,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, bzero(&init_addr, sizeof(init_addr)); - if (udp_mapping) { - MPASS(*udp_mapping == NULL); - } + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); /* * If we are UDP and have an existing mapping we can get source port @@ -354,16 +353,22 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, if (pd->ndport == htons(ICMP_ECHO)) { low = 1; high = 65535; - } else + } else { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); return (0); /* Don't try to modify non-echo ICMP */ + } } #ifdef INET6 if (pd->proto == IPPROTO_ICMPV6) { if (pd->ndport == htons(ICMP6_ECHO_REQUEST)) { low = 1; high = 65535; - } else + } else { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); return (0); /* Don't try to modify non-echo ICMP */ + } } #endif /* INET6 */ @@ -386,6 +391,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, */ if (pd->proto == IPPROTO_SCTP) { key.port[sidx] = pd->nsport; + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); if (!pf_find_state_all_exists(&key, dir)) { *nport = pd->nsport; return (0); @@ -400,6 +407,8 @@ 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); } @@ -413,6 +422,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, return (0); } } else { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); *nport = htons(low); return (0); } @@ -440,6 +451,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, key.port[sidx] = htons(tmp); if (!pf_find_state_all_exists(&key, dir)) { *nport = htons(tmp); + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); return (0); } } @@ -457,6 +470,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, } else { key.port[sidx] = htons(tmp); if (!pf_find_state_all_exists(&key, dir)) { + MPASS(udp_mapping == NULL || + *udp_mapping == NULL); *nport = htons(tmp); return (0); } @@ -473,13 +488,13 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, struct pf_addr *naddr, */ if (pf_map_addr_sn(pd->naf, r, &pd->nsaddr, naddr, &(pd->naf), NULL, &init_addr, rpool, sn_type)) - return (1); + goto failed; break; case PF_POOL_NONE: case PF_POOL_SRCHASH: case PF_POOL_BITMASK: default: - return (1); + goto failed; } } while (! PF_AEQ(&init_addr, naddr, pd->naf) ); diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 25cac1810349..7d5db6743424 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -257,6 +257,35 @@ endpoint_independent_compat_cleanup() rm -f server2.out } +atf_test_case "endpoint_independent_exhaust" "cleanup" +endpoint_independent_exhaust_head() +{ + atf_set descr 'Test that a client behind NAT gets the same external IP:port for different servers' + atf_set require.user root +} + +endpoint_independent_exhaust_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) port 3000:3001 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_exhaust_cleanup() +{ + pft_cleanup + rm -f server1.out + rm -f server2.out +} + atf_test_case "endpoint_independent_pass" "cleanup" endpoint_independent_pass_head() { @@ -851,6 +880,7 @@ atf_init_test_cases() atf_add_test_case "exhaust" 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_pass" atf_add_test_case "nat6_nolinklocal" atf_add_test_case "empty_table_source_hash"