Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next

1 files changed, 14 insertions, 0 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index a1ac1c5c729b..7740f61588d6 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -161,6 +161,17 @@ static int selinux_peerlbl_enabled(void)
         return (selinux_policycap_alwaysnetwork || netlbl_enabled() || selinux_xfrm_enabled());
 }
 
+static int selinux_netcache_avc_callback(u32 event)
+{
+        if (event == AVC_CALLBACK_RESET) {
+                sel_netif_flush();
+                sel_netnode_flush();
+                sel_netport_flush();
+                synchronize_net();
+        }
+        return 0;
+}
+
 /*
  * initialise the security for the init task
  */
@@ -6002,6 +6013,9 @@ static __init int selinux_init(void)
         if (register_security(&selinux_ops))
                 panic("SELinux: Unable to register with kernel.\n");
 
+        if (avc_add_callback(selinux_netcache_avc_callback, AVC_CALLBACK_RESET))
+                panic("SELinux: Unable to register AVC netcache callback\n");
+
         if (selinux_enforcing)
                 printk(KERN_DEBUG "SELinux:  Starting in enforcing mode\n");
         else