From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 14/14] ipvs: remove IPS_NAT_MASK check to fix passive FTP
Date: Fri, 2 Mar 2018 21:33:02 +0100 [thread overview]
Message-ID: <20180302203302.3724-15-pablo@netfilter.org> (raw)
In-Reply-To: <20180302203302.3724-1-pablo@netfilter.org>
From: Julian Anastasov <ja@ssi.bg>
The IPS_NAT_MASK check in 4.12 replaced previous check for nfct_nat()
which was needed to fix a crash in 2.6.36-rc, see
commit 7bcbf81a2296 ("ipvs: avoid oops for passive FTP").
But as IPVS does not set the IPS_SRC_NAT and IPS_DST_NAT bits,
checking for IPS_NAT_MASK prevents PASV response to be properly
mangled and blocks the transfer. Remove the check as it is not
needed after 3.12 commit 41d73ec053d2 ("netfilter: nf_conntrack:
make sequence number adjustments usuable without NAT") which
changes nfct_nat() with nfct_seqadj() and especially after 3.13
commit b25adce16064 ("ipvs: correct usage/allocation of seqadj
ext in ipvs").
Thanks to Li Shuang and Florian Westphal for reporting the problem!
Reported-by: Li Shuang <shuali@redhat.com>
Fixes: be7be6e161a2 ("netfilter: ipvs: fix incorrect conflict resolution")
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Acked-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/ipvs/ip_vs_ftp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index 3e17d32b629d..58d5d05aec24 100644
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -260,7 +260,7 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
buf_len = strlen(buf);
ct = nf_ct_get(skb, &ctinfo);
- if (ct && (ct->status & IPS_NAT_MASK)) {
+ if (ct) {
bool mangled;
/* If mangling fails this function will return 0
--
2.11.0
next prev parent reply other threads:[~2018-03-02 20:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 20:32 [PATCH 00/14] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 01/14] netfilter: ipt_CLUSTERIP: put config struct if we can't increment ct refcount Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 02/14] netfilter: ipt_CLUSTERIP: put config instead of freeing it Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 03/14] netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 04/14] netfilter: bridge: ebt_among: add missing match size checks Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 05/14] netfilter: ebtables: convert BUG_ONs to WARN_ONs Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 06/14] netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 07/14] netfilter: nf_flow_table: fix checksum when handling DNAT Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 08/14] netfilter: increase IPSTATS_MIB_CSUMERRORS stat Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 09/14] netfilter: don't set F_IFACE on ipv6 fib lookups Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 10/14] netfilter: use skb_to_full_sk in ip6_route_me_harder Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 11/14] netfilter: nf_tables: return EBUSY if device already belongs to flowtable Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 12/14] netfilter: nf_tables: missing attribute validation in nf_tables_delflowtable() Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 13/14] netfilter: nf_tables: use the right index from flowtable error path Pablo Neira Ayuso
2018-03-02 20:33 ` Pablo Neira Ayuso [this message]
2018-03-03 1:32 ` [PATCH 00/14] Netfilter/IPVS fixes for net David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302203302.3724-15-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).