Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1674382pxb; Mon, 20 Sep 2021 02:31:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFtt4pPEMa9lJ4MCipvZNsHNW2GbFeUg/mzrEFYalMvgb9trMNmPyCIEg/ArNAYQ3pse9L X-Received: by 2002:a92:c9c8:: with SMTP id k8mr17518230ilq.51.1632130299173; Mon, 20 Sep 2021 02:31:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632130299; cv=none; d=google.com; s=arc-20160816; b=MOuJnDGAGAZpf0D8TF87gPHyaQMj1r77/eGICnZslN91ehKBYu4UPiubSeifsQvTb/ A7MSv0WsxDlE5Fn34ZoBDMo9AmBnn7bMRhPVO4PamN8ypkFD3STu76VPYE/5ry1pqzaT 2e6I64jWb0RqACKSt6BmEtzLNYnxCOmHGdCZj1NjMEwC1v2VDBmUXi1Gb3VfXWCAiYu+ JIDP22fZ77KVH/dZVGGD86/+mOyzEKVPC/R+I7a0V5f174T6m3gWVU36VOVMFEaP1l6g zzoDSgTa80hlJ/Gz31RaATKJzlMA4xlmizVwRBbUpdGq+rfGJVbXkXDHjEgEmso5QQfS joQA== 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=keSjM3t4QtjfwZWV3juA3WDVo9ZI/U2I9NIfSLkTEIw=; b=MeceG1vHtFF8u3Vh2LiM7s1bKu2Rl2RGXN0Gg2ovaRinVvc9oXbq+NkTQpowUH+J2C gTZ27rZN3Nlkg6CMXLUftXB31eoV/8/NDTXe0xvLSPCTYt2d4ypLPMiyqhCjoerqtjmD yiGCRyeWKmW8Be4/5aP488uaJ9cDoxU6liwVblUM87wrG6uG78oAZrHSurxdc/Ap6h1o P+fXrA8VchmqGSwDllQwESaSklygv6D+mnQdUhq5+jWxnr3MyEIf/E2wko+xLzCE5eIo 1RCEkYxiPMWII32YtRLBip/JFU28pqrtud1Z2NK+YDqO9Sn0jxgAkV+k6JbGxbXH20sb 7mLw== 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 c17si14473903jam.29.2021.09.20.02.31.21; Mon, 20 Sep 2021 02:31:39 -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 S234899AbhITHYj (ORCPT + 99 others); Mon, 20 Sep 2021 03:24:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233436AbhITHYf (ORCPT ); Mon, 20 Sep 2021 03:24:35 -0400 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C0DBC061574; Mon, 20 Sep 2021 00:23:09 -0700 (PDT) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1mSDdp-0005mR-Mn; Mon, 20 Sep 2021 09:23:05 +0200 Date: Mon, 20 Sep 2021 09:23:05 +0200 From: Florian Westphal To: Cole Dishington Cc: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de, davem@davemloft.net, kuba@kernel.org, shuah@kernel.org, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, Anthony Lineham , Scott Parlane , Blair Steven Subject: Re: [PATCH net v5 2/2] net: netfilter: Fix port selection of FTP for NF_NAT_RANGE_PROTO_SPECIFIED Message-ID: <20210920072305.GI15906@breakpoint.cc> References: <20210920005905.9583-1-Cole.Dishington@alliedtelesis.co.nz> <20210920005905.9583-3-Cole.Dishington@alliedtelesis.co.nz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210920005905.9583-3-Cole.Dishington@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: > FTP port selection ignores specified port ranges (with iptables > masquerade --to-ports) when creating an expectation, based on > FTP commands PORT or PASV, for the data connection. > > For masquerading, this issue allows an FTP client to use unassigned > source ports for their data connection (in both the PORT and PASV > cases). This can cause problems in setups that allocate different > masquerade port ranges for each client. > > The proposed fix involves storing a port range (on nf_conn_nat) to: > - Fix FTP PORT data connections using the stored port range to select a > port number in nf_conntrack_ftp. > - Fix FTP PASV data connections using the stored port range to specify a > port range on source port in nf_nat_helper if the FTP PORT/PASV packet > comes from the client. Looks much simpler now, thanks. Acked-by: Florian Westphal