diff options
| author | Thomas Liu <tliu@redhat.com> | 2009-06-24 17:58:05 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-25 08:29:16 +1000 |
| commit | 89c86576ecde504da1eeb4f4882b2189ac2f9c4a (patch) | |
| tree | 94674a48becd9cfde298e9fe6b58db8da28fe238 /security/selinux | |
| parent | a893a84e8799270fbec5c3708d001650aab47138 (diff) | |
| download | linux-89c86576ecde504da1eeb4f4882b2189ac2f9c4a.tar.gz linux-89c86576ecde504da1eeb4f4882b2189ac2f9c4a.tar.bz2 linux-89c86576ecde504da1eeb4f4882b2189ac2f9c4a.zip | |
selinux: clean up avc node cache when disabling selinux
Added a call to free the avc_node_cache when inside selinux_disable because
it should not waste resources allocated during avc_init if SELinux is disabled
and the cache will never be used.
Signed-off-by: Thomas Liu <tliu@redhat.com>
Acked-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/avc.c | 6 | ||||
| -rw-r--r-- | security/selinux/hooks.c | 3 | ||||
| -rw-r--r-- | security/selinux/include/avc.h | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 7823e84dbe8d..236aaa2ea86d 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -970,3 +970,9 @@ u32 avc_policy_seqno(void) { return avc_cache.latest_notif; } + +void avc_disable(void) +{ + if (avc_node_cachep) + kmem_cache_destroy(avc_node_cachep); +} diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index e3b4f3083dd7..2081055f6783 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -5683,6 +5683,9 @@ int selinux_disable(void) selinux_disabled = 1; selinux_enabled = 0; + /* Try to destroy the avc node cache */ + avc_disable(); + /* Reset security_ops to the secondary module, dummy or capability. */ security_ops = secondary_ops; diff --git a/security/selinux/include/avc.h b/security/selinux/include/avc.h index 46a940d9af67..ae4c3a0e2c1a 100644 --- a/security/selinux/include/avc.h +++ b/security/selinux/include/avc.h @@ -131,6 +131,9 @@ int avc_add_callback(int (*callback)(u32 event, u32 ssid, u32 tsid, int avc_get_hash_stats(char *page); extern unsigned int avc_cache_threshold; +/* Attempt to free avc node cache */ +void avc_disable(void); + #ifdef CONFIG_SECURITY_SELINUX_AVC_STATS DECLARE_PER_CPU(struct avc_cache_stats, avc_cache_stats); #endif |