Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da0f7c75 authored by Florian Westphal's avatar Florian Westphal Committed by Pavel Machek
Browse files

netfilter: nat: remove l4 protocol port rovers 



commit 6ed5943f8735e2b778d92ea4d9805c0a1d89bc2b upstream.

This is a leftover from days where single-cpu systems were common:
Store last port used to resolve a clash to use it as a starting point when
the next conflict needs to be resolved.

When we have parallel attempt to connect to same address:port pair,
its likely that both cores end up computing the same "available" port,
as both use same starting port, and newly used ports won't become
visible to other cores until the conntrack gets confirmed later.

One of the cores then has to drop the packet at insertion time because
the chosen new tuple turns out to be in use after all.

Lets simplify this: remove port rover and use a pseudo-random starting
point.

Note that this doesn't make netfilter default to 'fully random' mode;
the 'rover' was only used if NAT could not reuse source port as-is.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a09b2d8f

include/net/netfilter/nf_nat_l4proto.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto, 
				 struct nf_conntrack_tuple *tuple,

				 const struct nf_nat_range *range,

				 enum nf_nat_manip_type maniptype,

				 const struct nf_conn *ct, u16 *rover);

				 const struct nf_conn *ct);



int nf_nat_l4proto_nlattr_to_range(struct nlattr *tb[],

				   struct nf_nat_range *range);

net/netfilter/nf_nat_proto_common.c

+2 −5
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto, 
				 struct nf_conntrack_tuple *tuple,

				 const struct nf_nat_range *range,

				 enum nf_nat_manip_type maniptype,

				 const struct nf_conn *ct,

				 u16 *rover)

				 const struct nf_conn *ct)

{

	unsigned int range_size, min, max, i;

	__be16 *portptr;
@@ -84,15 +83,13 @@ void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto, 
	} else if (range->flags & NF_NAT_RANGE_PROTO_RANDOM_FULLY) {

		off = prandom_u32();

	} else {

		off = *rover;

		off = prandom_u32();

	}



	for (i = 0; ; ++off) {

		*portptr = htons(min + off % range_size);

		if (++i != range_size && nf_nat_used_tuple(tuple, ct))

			continue;

		if (!(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL))

			*rover = off;

		return;

	}

}

net/netfilter/nf_nat_proto_dccp.c

+1 −4
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <net/netfilter/nf_nat_l3proto.h>

#include <net/netfilter/nf_nat_l4proto.h>



static u_int16_t dccp_port_rover;



static void

dccp_unique_tuple(const struct nf_nat_l3proto *l3proto,

		  struct nf_conntrack_tuple *tuple,
@@ -29,8 +27,7 @@ dccp_unique_tuple(const struct nf_nat_l3proto *l3proto, 
		  enum nf_nat_manip_type maniptype,

		  const struct nf_conn *ct)

{

	nf_nat_l4proto_unique_tuple(l3proto, tuple, range, maniptype, ct,

				    &dccp_port_rover);

	nf_nat_l4proto_unique_tuple(l3proto, tuple, range, maniptype, ct);

}



static bool

net/netfilter/nf_nat_proto_sctp.c

+1 −4
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 


#include <net/netfilter/nf_nat_l4proto.h>



static u_int16_t nf_sctp_port_rover;



static void

sctp_unique_tuple(const struct nf_nat_l3proto *l3proto,

		  struct nf_conntrack_tuple *tuple,
@@ -23,8 +21,7 @@ sctp_unique_tuple(const struct nf_nat_l3proto *l3proto, 
		  enum nf_nat_manip_type maniptype,

		  const struct nf_conn *ct)

{

	nf_nat_l4proto_unique_tuple(l3proto, tuple, range, maniptype, ct,

				    &nf_sctp_port_rover);

	nf_nat_l4proto_unique_tuple(l3proto, tuple, range, maniptype, ct);

}



static bool

net/netfilter/nf_nat_proto_tcp.c

+1 −4
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
#include <net/netfilter/nf_nat_l4proto.h>

#include <net/netfilter/nf_nat_core.h>



static u16 tcp_port_rover;



static void

tcp_unique_tuple(const struct nf_nat_l3proto *l3proto,

		 struct nf_conntrack_tuple *tuple,
@@ -27,8 +25,7 @@ tcp_unique_tuple(const struct nf_nat_l3proto *l3proto, 
		 enum nf_nat_manip_type maniptype,

		 const struct nf_conn *ct)

{

	nf_nat_l4proto_unique_tuple(l3proto, tuple, range, maniptype, ct,

				    &tcp_port_rover);

	nf_nat_l4proto_unique_tuple(l3proto, tuple, range, maniptype, ct);

}



static bool