Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Cole Dishington <Cole.Dishington@alliedtelesis.co.nz>
To:     pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de,
        davem@davemloft.net, kuba@kernel.org, shuah@kernel.org
Cc:     linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org,
        coreteam@netfilter.org, netdev@vger.kernel.org,
        Cole Dishington <Cole.Dishington@alliedtelesis.co.nz>,
        Anthony Lineham <anthony.lineham@alliedtelesis.co.nz>,
        Scott Parlane <scott.parlane@alliedtelesis.co.nz>,
        Blair Steven <blair.steven@alliedtelesis.co.nz>
Subject: [PATCH net v6 1/2] net: netfilter: Limit the number of ftp helper port attempts
Date:   Tue, 21 Sep 2021 08:44:38 +1200
Message-Id: <20210920204439.13179-2-Cole.Dishington@alliedtelesis.co.nz>
In-Reply-To: <20210920204439.13179-1-Cole.Dishington@alliedtelesis.co.nz>
References: <20210920204439.13179-1-Cole.Dishington@alliedtelesis.co.nz>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

In preparation of fixing the port selection of ftp helper when using
NF_NAT_RANGE_PROTO_SPECIFIED, limit the number of ftp helper port
attempts to 128.

Looping a large port range takes too long. Instead select a random
offset within [ntohs(exp->saved_proto.tcp.port), 65535] and try 128
ports.

Co-developed-by: Anthony Lineham <anthony.lineham@alliedtelesis.co.nz>
Signed-off-by: Anthony Lineham <anthony.lineham@alliedtelesis.co.nz>
Co-developed-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz>
Signed-off-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz>
Co-developed-by: Blair Steven <blair.steven@alliedtelesis.co.nz>
Signed-off-by: Blair Steven <blair.steven@alliedtelesis.co.nz>
Signed-off-by: Cole Dishington <Cole.Dishington@alliedtelesis.co.nz>
Acked-by: Florian Westphal <fw@strlen.de>
---

Notes:
	Thanks for your time reviewing!

	Changes:
	- Add missing argument from nf_ct_helper_log.
	- Add Acked-by: Florian Westphal <fw@strlen.de>

 net/netfilter/nf_nat_ftp.c | 39 +++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/net/netfilter/nf_nat_ftp.c b/net/netfilter/nf_nat_ftp.c
index aace6768a64e..2da29e5d4309 100644
--- a/net/netfilter/nf_nat_ftp.c
+++ b/net/netfilter/nf_nat_ftp.c
@@ -72,8 +72,11 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb,
 	u_int16_t port;
 	int dir =3D CTINFO2DIR(ctinfo);
 	struct nf_conn *ct =3D exp->master;
+	unsigned int i, min, max, range_size;
+	static const unsigned int max_attempts =3D 128;
 	char buffer[sizeof("|1||65535|") + INET6_ADDRSTRLEN];
 	unsigned int buflen;
+	int ret;
=20
 	pr_debug("type %i, off %u len %u\n", type, matchoff, matchlen);
=20
@@ -86,22 +89,32 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb,
 	 * this one. */
 	exp->expectfn =3D nf_nat_follow_master;
=20
-	/* Try to get same port: if not, try to change it. */
-	for (port =3D ntohs(exp->saved_proto.tcp.port); port !=3D 0; port++) {
-		int ret;
-
-		exp->tuple.dst.u.tcp.port =3D htons(port);
-		ret =3D nf_ct_expect_related(exp, 0);
-		if (ret =3D=3D 0)
-			break;
-		else if (ret !=3D -EBUSY) {
-			port =3D 0;
-			break;
+	min =3D ntohs(exp->saved_proto.tcp.port);
+	max =3D 65535;
+
+	/* Try to get same port */
+	ret =3D nf_ct_expect_related(exp, 0);
+
+	/* if same port is not in range or available, try to change it. */
+	if (ret !=3D 0) {
+		range_size =3D max - min + 1;
+		if (range_size > max_attempts)
+			range_size =3D max_attempts;
+
+		port =3D min + prandom_u32_max(max - min);
+		for (i =3D 0; i < range_size; i++) {
+			exp->tuple.dst.u.tcp.port =3D htons(port);
+			ret =3D nf_ct_expect_related(exp, 0);
+			if (ret !=3D -EBUSY)
+				break;
+			port++;
+			if (port > max)
+				port =3D min;
 		}
 	}
=20
-	if (port =3D=3D 0) {
-		nf_ct_helper_log(skb, ct, "all ports in use");
+	if (ret !=3D 0) {
+		nf_ct_helper_log(skb, ct, "tried %u ports, all were in use", range_siz=
e);
 		return NF_DROP;
 	}
=20
--=20
2.33.0