Message ID | 1385024728-4057-5-git-send-email-pablo@netfilter.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Hello. On 21-11-2013 13:05, Pablo Neira Ayuso wrote: > From: Phil Oester <kernel@linuxace.com> > In commit 41d73ec053d2, sequence number adjustments were moved to a Please also specify that commit's summary line in parens. > separate file. Unfortunately, the sequence numbers that are stored > in the nf_ct_seqadj structure are expressed in host byte order. The > necessary ntohl call was removed when the call to adjust_tcp_sequence > was collapsed into nf_ct_seqadj_set. This broke the FTP NAT helper. > Fix it by adding back the byte order conversions. > Reported-by: Dawid Stawiarski <dawid.stawiarski@netart.pl> > Signed-off-by: Phil Oester <kernel@linuxace.com> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/nf_conntrack_seqadj.c b/net/netfilter/nf_conntrack_seqadj.c index 5f9bfd0..17c1bcb 100644 --- a/net/netfilter/nf_conntrack_seqadj.c +++ b/net/netfilter/nf_conntrack_seqadj.c @@ -41,8 +41,8 @@ int nf_ct_seqadj_set(struct nf_conn *ct, enum ip_conntrack_info ctinfo, spin_lock_bh(&ct->lock); this_way = &seqadj->seq[dir]; if (this_way->offset_before == this_way->offset_after || - before(this_way->correction_pos, seq)) { - this_way->correction_pos = seq; + before(this_way->correction_pos, ntohl(seq))) { + this_way->correction_pos = ntohl(seq); this_way->offset_before = this_way->offset_after; this_way->offset_after += off; }