Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2355474pxb; Mon, 20 Sep 2021 19:56:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypovv+TBbNQJvAPKyJHqecNdbgyQIqjp+v3v4WlJdqRZfS/fIgP2xocGZXbMpWWVArrYhT X-Received: by 2002:a6b:2bce:: with SMTP id r197mr21195943ior.212.1632192977142; Mon, 20 Sep 2021 19:56:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632192977; cv=none; d=google.com; s=arc-20160816; b=UA8v2Z/zw6f5gRsGNDH2Me/igtMFrz/aekPnJRIZ4DgKC7xEonvKWw3BONLcv2Bvjw tc0bK7ds3oop6a1pkzEbC+djnim3qdwb9kb3Lplh/PRFxbmAIjE/Bo+3b5m/bZmTHd7j KQ+LUfS1EsSs8zFBoacTa+ZQtnU/oi5Y5bhyGY6gyZiiVLX68bDlTbES1KESQmAQypVa xU2RU9hp4QkoGoHm4azKQp8Ux3xZ853MENUmNVLQzD9T50g8+l7LfmadwhVzmkg44I9x TUFd5GArPKOzhb04LEcm9MD2sP/WH3oF3WKSjGZwxeAViFmjxBrrAvVxr0qDzNn/8bwN bl8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=A3hXOjI+P/TxKzBQBrxWgNBplidSCkfNmRVI7sFeCRk=; b=W3YnzTIU5IiAx+m7C364kV2CAXPp6hxj5uhsThOIZKIdfGWvbw6Vxg9vUrfjDnLDoO 1IomDx8zrYa8fj8NDZqTvDQ1gcBkwizC1QnWE0PVqsDmjhyig0EBRClzs9flBedk5aw5 lTboDfSTgburYdKFo++d83p6q+Zt/qgLuq6nqIIIcVH6SA2M1LEAzR7jXQudIGN/ywmF Ik13kwfh82/v8t4NTXCc7Ok26c4T6bh91BOiVfhRup1T0TeTdC6+oXQ3RyHxaSekTjrW 6c2mtsXL9ELOuM+EySn9UTB5FXjmi/SP3T19zkR2Rkx/K+IPpM6b8HKoQJ2Z4q5lepVb EmwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alliedtelesis.co.nz header.s=mail181024 header.b=OUgUEkNf; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alliedtelesis.co.nz Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e10si10699225ioc.1.2021.09.20.19.56.06; Mon, 20 Sep 2021 19:56:16 -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; dkim=pass header.i=@alliedtelesis.co.nz header.s=mail181024 header.b=OUgUEkNf; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alliedtelesis.co.nz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234644AbhITUsO (ORCPT + 99 others); Mon, 20 Sep 2021 16:48:14 -0400 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:40600 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230077AbhITUqN (ORCPT ); Mon, 20 Sep 2021 16:46:13 -0400 Received: from svr-chch-seg1.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 3DB11806A8; Tue, 21 Sep 2021 08:44:43 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1632170683; bh=A3hXOjI+P/TxKzBQBrxWgNBplidSCkfNmRVI7sFeCRk=; h=From:To:Cc:Subject:Date; b=OUgUEkNfiEuJlNhDPYX+/vkGBehSJGciLrUl4ZYUA5CMhtvOAjF9/BtIUozlwSNCs 6adS34t5ttiIvCToNnwDz4gJTI6vBiBUYwqYIAewgS55ly18V/wWkdnppYkvOhJfOM H9uG8LTstVdhnlPKOBB2LjWhokWfCZ9C/1w5WRP7q30fhRGx81da15r5OeAthYV1KT cgP5C2US97LzY9TRRgFudmFn0GdY22bSbENWMgaQv2SBk2ivjp14EouOdAwaCG2TQs VEdX+M40gxphYrLgybXQDglIxzRqcBak2tkC36Q+dXA8qOiHsiCd/CBNzfgIyrAH0Q huuE8kC4z1Nyw== Received: from pat.atlnz.lc (Not Verified[10.32.16.33]) by svr-chch-seg1.atlnz.lc with Trustwave SEG (v8,2,6,11305) id ; Tue, 21 Sep 2021 08:44:42 +1200 Received: from coled-dl.ws.atlnz.lc (coled-dl.ws.atlnz.lc [10.33.25.26]) by pat.atlnz.lc (Postfix) with ESMTP id D8FA913EE39; Tue, 21 Sep 2021 08:44:42 +1200 (NZST) Received: by coled-dl.ws.atlnz.lc (Postfix, from userid 1801) id D2DF7242827; Tue, 21 Sep 2021 08:44:42 +1200 (NZST) From: Cole Dishington 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 Subject: [PATCH net v6 0/2] Fix port selection of FTP for NF_NAT_RANGE_PROTO_SPECIFIED Date: Tue, 21 Sep 2021 08:44:37 +1200 Message-Id: <20210920204439.13179-1-Cole.Dishington@alliedtelesis.co.nz> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.3 cv=FtN7AFjq c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=7QKq2e-ADPsA:10 a=8zFdtlccS6W11XtEw-MA:9 a=7Zwj6sZBwVKJAoWSPKxL6X1jA+E=:19 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks for your time reviewing! Changes: - Fix compiler warning in 1/2 patch. - Add Acked-by: Florian Westphal to 1/2 and 2/2. Cole Dishington (2): net: netfilter: Limit the number of ftp helper port attempts net: netfilter: Fix port selection of FTP for NF_NAT_RANGE_PROTO_SPECIFIED include/net/netfilter/nf_nat.h | 6 ++++ net/netfilter/nf_nat_core.c | 9 ++++++ net/netfilter/nf_nat_ftp.c | 51 ++++++++++++++++++++++++++-------- net/netfilter/nf_nat_helper.c | 10 +++++++ 4 files changed, 65 insertions(+), 11 deletions(-) --=20 2.33.0