---

yaml --- r: 264065 b: refs/heads/master c: bcf66bf h: refs/heads/master i: 264063: 5d7ea9b v: v3
git-mirror · Sep 21, 2011 · 5398561 · 5398561
1 parent 45b1df5
commit 5398561
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 561dac2d410ffac0b57a23b85ae0a623c1a076ca
+refs/heads/master: bcf66bf54aabffc150acd1c99e0f4bc51935eada
diff --git a/trunk/net/xfrm/xfrm_input.c b/trunk/net/xfrm/xfrm_input.c
@@ -212,6 +212,11 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
 		/* only the first xfrm gets the encap type */
 		encap_type = 0;
 
+		if (async && x->repl->check(x, skb, seq)) {
+			XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATESEQERROR);
+			goto drop_unlock;
+		}
+
 		x->repl->advance(x, seq);
 
 		x->curlft.bytes += skb->len;