Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2370143pxb; Fri, 17 Sep 2021 08:18:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+bCLoD49qyo9Ss53rvZxbF8V+xbjwRKMhvVkG8D+YExpHVI/eRGLhtLEpG0I87Q/h1Uvz X-Received: by 2002:a17:906:dbf8:: with SMTP id yd24mr13084367ejb.560.1631891925933; Fri, 17 Sep 2021 08:18:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631891925; cv=none; d=google.com; s=arc-20160816; b=hXfMckl6AuIUz7VcEV26S05k0kJRlEXOZ3TMnly0GAwzxEfAezUC7lVT4O8cuByeDe LTkxmhvEgGfbJpGFkVyriVTcEISYpKC5OjyoG1WAYfXK7BoNTC5Hj5vyyYIkDJ67r6aS /clmbIzDJ0zZzE5UCg6AUsmkHCczbj8gEVuMemw1NdTjqAolLTMLH4YIzlNhFi01kRZm LHgkQoJu4ss0BuHDVLbKPBrTeXGC9E3a/EIBtBqY8y4IoBNGh7TbZzCtMTXsCjCFmxja vaIQZkGoN96m8XwbJOznhVQSiA7yVO5NtUEZi5N6vZl4VfEvoTOEZA7GrB9EOzm59C1a b+kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date; bh=5jAorGJ416rMl7yPOsgBVLOVwo8QCzKr3FW/9IyEG0g=; b=IlSPE22v89c6nkVEqXbqvLPHygWw8zvx52OVEdM7LZjOL5GwTDYXskSsgIwcu59Bz/ oUGpmrPPRnpkB7kxZisJRykpcy4uY7S6SgjHAtN24e04pjmbti3KLbe9dILdkRhHbPgj guECdz5Hax8xQCgl50E55zZE/m0PK6/J9KqQuHuVW9BD3CF1booRfDiPX4BKgEKz0Aq9 C95zsJkISPnLfLgTTlrkbayl7+XDtyEWdGE/rp3026G+Z1SwhDzc/r5Yuf2HUgKuMD69 bt/zLGLTWUAtnNcGVTYBZVjhzfYTS/luf99+1jvr4P9FpAmKwPP8qryZquMU21AO3RAr vEAg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h14si6719506ejl.480.2021.09.17.08.18.17; Fri, 17 Sep 2021 08:18:45 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240759AbhIQOFq (ORCPT + 99 others); Fri, 17 Sep 2021 10:05:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234531AbhIQOFl (ORCPT ); Fri, 17 Sep 2021 10:05:41 -0400 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 080F7C061574; Fri, 17 Sep 2021 07:04:18 -0700 (PDT) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1mRETI-0002CE-9i; Fri, 17 Sep 2021 16:04:08 +0200 Date: Fri, 17 Sep 2021 16:04:08 +0200 From: Florian Westphal To: Cole Dishington Cc: "fw@strlen.de" , "coreteam@netfilter.org" , "netfilter-devel@vger.kernel.org" , "davem@davemloft.net" , "pablo@netfilter.org" , Anthony Lineham , "shuah@kernel.org" , "kadlec@netfilter.org" , "linux-kernel@vger.kernel.org" , "kuba@kernel.org" , "netdev@vger.kernel.org" , Blair Steven , Scott Parlane Subject: Re: [PATCH net v4] net: netfilter: Fix port selection of FTP for NF_NAT_RANGE_PROTO_SPECIFIED Message-ID: <20210917140408.GD15906@breakpoint.cc> References: <20210916041057.459-1-Cole.Dishington@alliedtelesis.co.nz> <20210916112641.GC20414@breakpoint.cc> <77b0addceb098af07f3bb20fbb708d190ae58b03.camel@alliedtelesis.co.nz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <77b0addceb098af07f3bb20fbb708d190ae58b03.camel@alliedtelesis.co.nz> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Cole Dishington wrote: > On Thu, 2021-09-16 at 13:26 +0200, Florian Westphal wrote: > > >range_info.max_proto.all) { > > min = 1; > > max = 65535; > > range_size = 65535; > > } else { > > min = ntohs(nat->range_info.min_proto.all); > > max = ntohs(nat->range_info.max_proto.all); > > range_size = max - min + 1; > > } > > The original code defined the range as [ntohs(exp->saved_proto.tcp.port), 65535]. The above would > cause a change in behaviour, should we try to avoid it? Oh indeed, oversight on my part. Good question, current loop is not good either as it might take too long to complete. Maybe best to limit/cap the range to 128, e.g. try to use port as-is, then pick a random value between 1024 and 65535 - 128, make 128 tries and if all is taken, error out. I will leave it up to you on how you'd like to handle this. One way would be to make a small preparation patch and then built the range patch on top of it.