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>
This commit is contained in:

committed by
James Morris

parent
592fe89806
commit
86812bb0de
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user