Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23dfe136 authored by Phil Oester's avatar Phil Oester Committed by Pablo Neira Ayuso
Browse files

netfilter: fix wrong byte order in nf_ct_seqadj_set internal information 



In commit 41d73ec0, sequence number adjustments were moved to a
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: default avatarDawid Stawiarski <dawid.stawiarski@netart.pl>
Signed-off-by: default avatarPhil Oester <kernel@linuxace.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c1898c4c

net/netfilter/nf_conntrack_seqadj.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}