From 53985616b0fb650a5db72329f46b59eac6861e79 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Tue, 20 Sep 2011 23:38:58 +0000
Subject: [PATCH] --- yaml --- r: 264065 b: refs/heads/master c:
 bcf66bf54aabffc150acd1c99e0f4bc51935eada h: refs/heads/master i:   264063:
 5d7ea9b5cc558a9603a5ede41b6bbd9888a61572 v: v3

---
 [refs]                      | 2 +-
 trunk/net/xfrm/xfrm_input.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fff52c90da65..fc7e9f99bc32 100644
--- 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
index a026b0ef2443..54a0dc2e2f8d 100644
--- 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;