Skip to contentSkip to conversation

netfilter: byte order issue in nf_ct_seqadj_set

PATCH Applied Phil Oester 2 participants 2 messages Nov 17, 2013 – Nov 19, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: byte order issue in nf_ct_seqadj_set

In commit 41d73ec053d2, sequence number adjustments were moved to a separate file. Unfortunately, a necessary ntohl call was removed when the call to adjust_tcp_sequence was collapsed into nf_ct_seqadj_set. As reported by Dawid Stawiarsk, this broke the FTP NAT helper. Add back the byte order conversions.

Fixes 41d73ec053d2 ("netfilter: nf_conntrack: make sequence number adjustments usuable without NAT")
net/netfilter/nf_conntrack_seqadj.c +2 -2
index 5f9bfd0..17c1bcb 100644
@@ -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;
 	}
maintainer Applied
#1 lore raw
Quoted 5 lines · Phil Oester

In commit 41d73ec053d2, sequence number adjustments were moved to a separate file. Unfortunately, a necessary ntohl call was removed when the call to adjust_tcp_sequence was collapsed into nf_ct_seqadj_set. As reported by Dawid Stawiarsk, this broke the FTP NAT helper. Add back the byte order conversions.

Applied, thanks Phil.