2 files changed, 6 insertions, 2 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d4cbf7d16f07..83d06db34d03 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3320,6 +3320,9 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd,
         case F_GETLK:
         case F_SETLK:
         case F_SETLKW:
+        case F_OFD_GETLK:
+        case F_OFD_SETLK:
+        case F_OFD_SETLKW:
 #if BITS_PER_LONG == 32
         case F_GETLK64:
         case F_SETLK64:
diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
index 9f0584710c85..1450f85b946d 100644
--- a/security/selinux/include/xfrm.h
+++ b/security/selinux/include/xfrm.h
@@ -46,10 +46,11 @@ static inline void selinux_xfrm_notify_policyload(void)
 {
         struct net *net;
 
-        atomic_inc(&flow_cache_genid);
         rtnl_lock();
-        for_each_net(net)
+        for_each_net(net) {
+                atomic_inc(&net->xfrm.flow_cache_genid);
                 rt_genid_bump_all(net);
+        }
         rtnl_unlock();
 }
 #else