diff options
| author | Casey Schaufler <casey@schaufler-ca.com> | 2012-04-17 18:55:46 -0700 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-04-18 12:02:28 +1000 |
| commit | 86812bb0de1a3758dc6c7aa01a763158a7c0638a (patch) | |
| tree | 41cb41cd7fe52730a3fe8c88ca298c2494f9040a /security/smack/smackfs.c | |
| parent | 592fe8980688e7cba46897685d014c7fb3018a67 (diff) | |
Smack: move label list initialization
A kernel with Smack enabled will fail if tmpfs has xattr support.
Move the initialization of predefined Smack label
list entries to the LSM initialization from the
smackfs setup. This became an issue when tmpfs
acquired xattr support, but was never correct.
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security/smack/smackfs.c')
| -rw-r--r-- | security/smack/smackfs.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 5c32f36ff70..038811cb7e6 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -1614,20 +1614,6 @@ static int __init init_smk_fs(void) smk_cipso_doi(); smk_unlbl_ambient(NULL); - mutex_init(&smack_known_floor.smk_rules_lock); - mutex_init(&smack_known_hat.smk_rules_lock); - mutex_init(&smack_known_huh.smk_rules_lock); - mutex_init(&smack_known_invalid.smk_rules_lock); - mutex_init(&smack_known_star.smk_rules_lock); - mutex_init(&smack_known_web.smk_rules_lock); - - INIT_LIST_HEAD(&smack_known_floor.smk_rules); - INIT_LIST_HEAD(&smack_known_hat.smk_rules); - INIT_LIST_HEAD(&smack_known_huh.smk_rules); - INIT_LIST_HEAD(&smack_known_invalid.smk_rules); - INIT_LIST_HEAD(&smack_known_star.smk_rules); - INIT_LIST_HEAD(&smack_known_web.smk_rules); - return err; } |