Commit d21b7b04 authored by José Bollo's avatar José Bollo Committed by Casey Schaufler

Smack: Minor initialisation improvement

This change has two goals:
 - delay the setting of 'smack_enabled' until
   it will be really effective
 - ensure that smackfs is valid only if 'smack_enabled'
   is set (it is already the case in smack_netfilter.c)
Signed-off-by: default avatarJosé Bollo <jose.bollo@iot.bzh>
Acked-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
parent 8b549ef4
...@@ -4708,8 +4708,6 @@ static __init int smack_init(void) ...@@ -4708,8 +4708,6 @@ static __init int smack_init(void)
if (!security_module_enable("smack")) if (!security_module_enable("smack"))
return 0; return 0;
smack_enabled = 1;
smack_inode_cache = KMEM_CACHE(inode_smack, 0); smack_inode_cache = KMEM_CACHE(inode_smack, 0);
if (!smack_inode_cache) if (!smack_inode_cache)
return -ENOMEM; return -ENOMEM;
...@@ -4721,6 +4719,8 @@ static __init int smack_init(void) ...@@ -4721,6 +4719,8 @@ static __init int smack_init(void)
return -ENOMEM; return -ENOMEM;
} }
smack_enabled = 1;
pr_info("Smack: Initializing.\n"); pr_info("Smack: Initializing.\n");
#ifdef CONFIG_SECURITY_SMACK_NETFILTER #ifdef CONFIG_SECURITY_SMACK_NETFILTER
pr_info("Smack: Netfilter enabled.\n"); pr_info("Smack: Netfilter enabled.\n");
......
...@@ -2892,7 +2892,7 @@ static int __init init_smk_fs(void) ...@@ -2892,7 +2892,7 @@ static int __init init_smk_fs(void)
int err; int err;
int rc; int rc;
if (!security_module_enable("smack")) if (smack_enabled == 0)
return 0; return 0;
err = smk_init_sysfs(); err = smk_init_sysfs();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment