Merge tag 'v3.12'

Linux 3.12

1 files changed, 6 insertions, 1 deletions

diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
index 7605251936f5..0dec76c64cf5 100644
--- a/security/selinux/include/xfrm.h
+++ b/security/selinux/include/xfrm.h
@@ -42,8 +42,13 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
 
 static inline void selinux_xfrm_notify_policyload(void)
 {
+        struct net *net;
+
         atomic_inc(&flow_cache_genid);
-        rt_genid_bump(&init_net);
+        rtnl_lock();
+        for_each_net(net)
+                rt_genid_bump_all(net);
+        rtnl_unlock();
 }
 #else
 static inline int selinux_xfrm_enabled(void)