Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / net / netfilter / nf_conntrack_seqadj.c

diff --git a/net/netfilter/nf_conntrack_seqadj.c b/net/netfilter/nf_conntrack_seqadj.c
index dff0f0c..ef7063e 100644 (file)
--- a/net/netfilter/nf_conntrack_seqadj.c
+++ b/net/netfilter/nf_conntrack_seqadj.c
@@ -169,7 +169,7 @@ int nf_ct_seq_adjust(struct sk_buff *skb,
        s32 seqoff, ackoff;
        struct nf_conn_seqadj *seqadj = nfct_seqadj(ct);
        struct nf_ct_seqadj *this_way, *other_way;
-       int res;
+       int res = 1;
 
        this_way  = &seqadj->seq[dir];
        other_way = &seqadj->seq[!dir];
@@ -184,27 +184,31 @@ int nf_ct_seq_adjust(struct sk_buff *skb,
        else
                seqoff = this_way->offset_before;
 
+       newseq = htonl(ntohl(tcph->seq) + seqoff);
+       inet_proto_csum_replace4(&tcph->check, skb, tcph->seq, newseq, false);
+       pr_debug("Adjusting sequence number from %u->%u\n",
+                ntohl(tcph->seq), ntohl(newseq));
+       tcph->seq = newseq;
+
+       if (!tcph->ack)
+               goto out;
+
        if (after(ntohl(tcph->ack_seq) - other_way->offset_before,
                  other_way->correction_pos))
                ackoff = other_way->offset_after;
        else
                ackoff = other_way->offset_before;
 
-       newseq = htonl(ntohl(tcph->seq) + seqoff);
        newack = htonl(ntohl(tcph->ack_seq) - ackoff);
-
-       inet_proto_csum_replace4(&tcph->check, skb, tcph->seq, newseq, false);
        inet_proto_csum_replace4(&tcph->check, skb, tcph->ack_seq, newack,
                                 false);
-
-       pr_debug("Adjusting sequence number from %u->%u, ack from %u->%u\n",
+       pr_debug("Adjusting ack number from %u->%u, ack from %u->%u\n",
                 ntohl(tcph->seq), ntohl(newseq), ntohl(tcph->ack_seq),
                 ntohl(newack));
-
-       tcph->seq = newseq;
        tcph->ack_seq = newack;
 
        res = nf_ct_sack_adjust(skb, protoff, tcph, ct, ctinfo);
+out:
        spin_unlock_bh(&ct->lock);
 
        return res;