Revert "netfilter: nat: force port remap to prevent shadowing well-known ports"
Subsystems (3)
Florian Westphal
maintainerPATCH 1/1 Revert "netfilter: nat: force port remap to prevent shadowing well-known ports"
This reverts commit 878aed8db324bec64f3c3f956e64d5ae7375a5de.
This change breaks existing setups where conntrack is used with asymmetric paths.
In these cases, the NAT transformation occurs on the syn-ack instead of the syn:
1. SYN x:12345 -> y -> 443 // sent by initiator, received by responder
2. SYNACK y:443 -> x:12345 // first packet seen by conntrack, sent by responder
3. tuple_force_port_remap() gets called, sees:
'tcp from 443 to port 12345 NAT' -> pick a new source port, inititor receives
4. SYNACK y:$RANDOM -> x:12345 // connection is never established
While its possible to avoid the breakage with NOTRACK rules, a kernel update should not break working setups.
An alternative to the revert is to augment conntrack to tag mid-stream pickup connections (see Link below) plus more code in the nat core to skip NAT for such connections. However, this leads to more interaction/integration between conntrack and NAT which isn't ideal either.
Therefore, revert, users will need to add explicit nat rules to avoid port shadowing.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2051413
--- net/netfilter/nf_nat_core.c | 43 ++------------------ tools/testing/selftests/netfilter/nft_nat.sh | 5 +-- 2 files changed, 5 insertions(+), 43 deletions(-)
net/netfilter/nf_nat_core.c +3 -40
@@ -494,38 +494,6 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple, goto another_round; } -static bool tuple_force_port_remap (const struct nf_conntrack_tuple *tuple) -{ -u16 sp, dp; - -switch (tuple->dst.protonum) { -case IPPROTO_TCP : - sp =ntohs (tuple->src.u.tcp.port); - dp =ntohs (tuple->dst.u.tcp.port); -break ; -case IPPROTO_UDP : -case IPPROTO_UDPLITE : - sp =ntohs (tuple->src.u.udp.port); - dp =ntohs (tuple->dst.u.udp.port); -break ; -default : -return false; - } - -/* IANA: System port range: 1-1023, -* user port range: 1024-49151, -* private port range: 49152-65535. -* -* Linux default ephemeral port range is 32768-60999. -* -* Enforce port remapping if sport is significantly lower -* than dport to prevent NAT port shadowing, i.e. -* accidental match of 'new' inbound connection vs. -* existing outbound one. -*/ -return sp <16384 && dp >=32768 ; -} -/* Manipulate the tuple into the range given. For NF_INET_POST_ROUTING, * we change the source to map into the range. For NF_INET_PRE_ROUTING * and NF_INET_LOCAL_OUT, we change the destination to map into the
@@ -539,17 +507,11 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,struct nf_conn *ct, enum nf_nat_manip_type maniptype) { - bool random_port = range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL; const struct nf_conntrack_zone *zone;struct net *net =nf_ct_net (ct); zone =nf_ct_zone (ct); -if (maniptype ==NF_NAT_MANIP_SRC && - !random_port && - !ct->local_origin) - random_port =tuple_force_port_remap (orig_tuple); -/* 1) If this srcip/proto/src-proto-part is currently mapped, * and that same mapping gives a unique tuple within the given * range, use that.
@@ -558,7 +520,8 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,* So far, we don't do local source mappings, so multiple * manips not an issue. */ -if (maniptype ==NF_NAT_MANIP_SRC && !random_port) { +if (maniptype ==NF_NAT_MANIP_SRC && + !(range->flags &NF_NAT_RANGE_PROTO_RANDOM_ALL )) {/* try the original tuple first */ if (in_range (orig_tuple, range)) {if (!nf_nat_used_tuple (orig_tuple, ct)) {
@@ -582,7 +545,7 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,*/ /* Only bother mapping if it's not already in range and unique */ - if (!random_port) { + if (!(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL)) { if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) { if (!(range->flags & NF_NAT_RANGE_PROTO_OFFSET) && l4proto_in_range(tuple, maniptype,
tools/testing/selftests/netfilter/nft_nat.sh +2 -3
@@ -880,9 +880,8 @@ EOF return $ksft_skip fi - # test default behaviour. Packet from ns1 to ns0 is not redirected - # due to automatic port translation. - test_port_shadow "default" "ROUTER" + # test default behaviour. Packet from ns1 to ns0 is redirected to ns2. + test_port_shadow "default" "CLIENT" # test packet filter based mitigation: prevent forwarding of # packets claiming to come from the service port.
Signature · 1 line
2.34.1
Florian Westphal
maintainerPATCH 1/1 Revert "netfilter: conntrack: tag conntracks picked up in local out hook"
This was a prerequisite for the ill-fated
"netfilter: nat: force port remap to prevent shadowing well-known ports".
As this has been reverted, this change can be backed out too.
--- include/net/netfilter/nf_conntrack.h | 1 - net/netfilter/nf_conntrack_core.c | 3 --- 2 files changed, 4 deletions(-)
include/net/netfilter/nf_conntrack.h +0 -1
@@ -97,7 +97,6 @@ struct nf_conn {unsigned long status;u16 cpu; - u16 local_origin:1;possible_net_t ct_net;#if IS_ENABLED (CONFIG_NF_NAT )
net/netfilter/nf_conntrack_core.c +0 -3
@@ -1748,9 +1748,6 @@ resolve_normal_ct(struct nf_conn *tmpl,return 0 ;if (IS_ERR (h))return PTR_ERR (h); - - ct =nf_ct_tuplehash_to_ctrack (h); - ct->local_origin = state->hook ==NF_INET_LOCAL_OUT ; } ct =nf_ct_tuplehash_to_ctrack (h);
Signature · 1 line
2.34.1
Florian Westphal
maintainerRe: [PATCH nf] Revert "netfilter: conntrack: tag conntracks picked up in local out hook"
Quoted 4 lines · Florian Westphal
This was a prerequisite for the ill-fated
"netfilter: nat: force port remap to prevent shadowing well-known ports".As this has been reverted, this change can be backed out too.
I pushed both reverts to nf.git.