From: José Bollo <jobol@nonadev.net>
Date: Fri, 2 Oct 2015 13:15:56 +0000 (+0200)
Subject: BACKPORT: Smack: Minor initialisation improvement
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e407dc42951621fea4dda77262255c30718b8e7;p=platform%2Fkernel%2Flinux-stable.git

BACKPORT: 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: José Bollo <jose.bollo@iot.bzh>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
(cherry-picked from upstream d21b7b049c0c1753a10c1d01606f42bad0e0f733)
---

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 4088d6c58194..6405066d38a3 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -4711,8 +4711,6 @@ static __init int smack_init(void)
 	if (!security_module_enable("smack"))
 		return 0;
 
-	smack_enabled = 1;
-
 	smack_inode_cache = KMEM_CACHE(inode_smack, 0);
 	if (!smack_inode_cache)
 		return -ENOMEM;
@@ -4724,6 +4722,8 @@ static __init int smack_init(void)
 		return -ENOMEM;
 	}
 
+	smack_enabled = 1;
+
 	pr_info("Smack:  Initializing.\n");
 #ifdef CONFIG_SECURITY_SMACK_NETFILTER
 	pr_info("Smack:  Netfilter enabled.\n");
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 63e52e24a6ff..516acfea351d 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -2896,7 +2896,7 @@ static int __init init_smk_fs(void)
 	int err;
 	int rc;
 
-	if (!security_module_enable("smack"))
+	if (smack_enabled == 0)
 		return 0;
 
 	err = smk_init_sysfs();