2 files changed, 41 insertions, 2 deletions

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index c48ea873f1e0..857821360bb6 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -105,6 +105,10 @@ struct rt6_info
         struct rt6key                   rt6i_src;
 
         u8                              rt6i_protocol;
+
+#ifdef CONFIG_XFRM
+        u32                             rt6i_flow_cache_genid;
+#endif
 };
 
 static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index 116f94a49071..25b931709749 100644
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -139,6 +139,41 @@ void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr * uaddr)
 
 EXPORT_SYMBOL_GPL(inet6_csk_addr2sockaddr);
 
+static inline
+void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
+                           struct in6_addr *daddr, struct in6_addr *saddr)
+{
+        __ip6_dst_store(sk, dst, daddr, saddr);
+
+#ifdef CONFIG_XFRM
+        if (dst) {
+                struct rt6_info *rt = (struct rt6_info  *)dst;
+                rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
+        }
+#endif
+}
+
+static inline
+struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
+{
+        struct dst_entry *dst;
+
+        dst = __sk_dst_check(sk, cookie);
+
+#ifdef CONFIG_XFRM
+        if (dst) {
+                struct rt6_info *rt = (struct rt6_info *)dst;
+                if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
+                        sk->sk_dst_cache = NULL;
+                        dst_release(dst);
+                        dst = NULL;
+                }
+        }
+#endif
+
+        return dst;
+}
+
 int inet6_csk_xmit(struct sk_buff *skb, int ipfragok)
 {
         struct sock *sk = skb->sk;
@@ -166,7 +201,7 @@ int inet6_csk_xmit(struct sk_buff *skb, int ipfragok)
                 final_p = &final;
         }
 
-        dst = __sk_dst_check(sk, np->dst_cookie);
+        dst = __inet6_csk_dst_check(sk, np->dst_cookie);
 
         if (dst == NULL) {
                 int err = ip6_dst_lookup(sk, &dst, &fl);
@@ -186,7 +221,7 @@ int inet6_csk_xmit(struct sk_buff *skb, int ipfragok)
                         return err;
                 }
 
-                __ip6_dst_store(sk, dst, NULL, NULL);
+                __inet6_csk_dst_store(sk, dst, NULL, NULL);
         }
 
         skb->dst = dst_clone(dst);