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

Commit 0658cdc8 authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat: fix locking in nf_nat_seq_adjust() 



nf_nat_seq_adjust() needs to grab nf_nat_seqofs_lock to protect against
concurrent changes to the sequence adjustment data.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 02982c27

net/netfilter/nf_nat_helper.c

+6 −1
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ nf_nat_seq_adjust(struct sk_buff *skb, 
	s16 seqoff, ackoff;

	struct nf_conn_nat *nat = nfct_nat(ct);

	struct nf_nat_seq *this_way, *other_way;

	int res;



	dir = CTINFO2DIR(ctinfo);
@@ -383,6 +384,7 @@ nf_nat_seq_adjust(struct sk_buff *skb, 
		return 0;



	tcph = (void *)skb->data + protoff;

	spin_lock_bh(&nf_nat_seqofs_lock);

	if (after(ntohl(tcph->seq), this_way->correction_pos))

		seqoff = this_way->offset_after;

	else
@@ -407,7 +409,10 @@ nf_nat_seq_adjust(struct sk_buff *skb, 
	tcph->seq = newseq;

	tcph->ack_seq = newack;



	return nf_nat_sack_adjust(skb, protoff, tcph, ct, ctinfo);

	res = nf_nat_sack_adjust(skb, protoff, tcph, ct, ctinfo);

	spin_unlock_bh(&nf_nat_seqofs_lock);



	return res;

}



/* Setup NAT on this expected conntrack so it follows master. */