sctp: add sctp_packet_singleton

[linux.git] / security / selinux / netnode.c

diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index 03a72c32afd738ccad5c188bbe853202c32f53f6..6dd89b89bc1f6f2fa8cad39b567d18e93ef5e2b9 100644 (file)
--- a/security/selinux/netnode.c
+++ b/security/selinux/netnode.c
@@ -215,12 +215,12 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
                goto out;
        switch (family) {
        case PF_INET:
-               ret = security_node_sid(PF_INET,
+               ret = security_node_sid(&selinux_state, PF_INET,
                                        addr, sizeof(struct in_addr), sid);
                new->nsec.addr.ipv4 = *(__be32 *)addr;
                break;
        case PF_INET6:
-               ret = security_node_sid(PF_INET6,
+               ret = security_node_sid(&selinux_state, PF_INET6,
                                        addr, sizeof(struct in6_addr), sid);
                new->nsec.addr.ipv6 = *(struct in6_addr *)addr;
                break;
@@ -283,7 +283,7 @@ int sel_netnode_sid(void *addr, u16 family, u32 *sid)
  * Remove all entries from the network address table.
  *
  */
-static void sel_netnode_flush(void)
+void sel_netnode_flush(void)
 {
        unsigned int idx;
        struct sel_netnode *node, *node_tmp;
@@ -300,19 +300,9 @@ static void sel_netnode_flush(void)
        spin_unlock_bh(&sel_netnode_lock);
 }
 
-static int sel_netnode_avc_callback(u32 event)
-{
-       if (event == AVC_CALLBACK_RESET) {
-               sel_netnode_flush();
-               synchronize_net();
-       }
-       return 0;
-}
-
 static __init int sel_netnode_init(void)
 {
        int iter;
-       int ret;
 
        if (!selinux_enabled)
                return 0;
@@ -322,11 +312,7 @@ static __init int sel_netnode_init(void)
                sel_netnode_hash[iter].size = 0;
        }
 
-       ret = avc_add_callback(sel_netnode_avc_callback, AVC_CALLBACK_RESET);
-       if (ret != 0)
-               panic("avc_add_callback() failed, error %d\n", ret);
-
-       return ret;
+       return 0;
 }
 
 __initcall(sel_netnode_init);