diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-19 17:39:19 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-19 17:39:19 +1000 |
| commit | 2ccf4661f315615d018686d91d030a94001d0cc6 (patch) | |
| tree | f5374b5233ba5c43a4710bc8cbc5319091da044e /security/selinux/netnode.c | |
| parent | 32c2e6752ff0f48fe03b9e1c7c64bde580a840d2 (diff) | |
| parent | 615e51fdda6f274e94b1e905fcaf6111e0d9aa20 (diff) | |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux/netnode.c')
| -rw-r--r-- | security/selinux/netnode.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c index 03a72c32afd7..ddf315260839 100644 --- a/security/selinux/netnode.c +++ b/security/selinux/netnode.c @@ -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,15 +300,6 @@ 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; @@ -322,10 +313,6 @@ 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; } |