mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
[PATCH] selinuxfs cleanups: sel_make_bools
Remove the call to sel_make_bools() from sel_fill_super(), as policy needs to be loaded before the boolean files can be created. Policy will never be loaded during sel_fill_super() as selinuxfs is kernel mounted during init and the only means to load policy is via selinuxfs. Also, the call to d_genocide() on the error path of sel_make_bools() is incorrect and replaced with sel_remove_bools(). Signed-off-by: James Morris <jmorris@namei.org> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
161ce45a8a
commit
253a8b1db1
1 changed files with 1 additions and 4 deletions
|
@ -970,7 +970,7 @@ static int sel_make_bools(void)
|
||||||
return ret;
|
return ret;
|
||||||
err:
|
err:
|
||||||
kfree(values);
|
kfree(values);
|
||||||
d_genocide(dir);
|
sel_remove_bools(dir);
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@ -1226,9 +1226,6 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
bool_dir = dentry;
|
bool_dir = dentry;
|
||||||
ret = sel_make_bools();
|
|
||||||
if (ret)
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
dentry = d_alloc_name(sb->s_root, NULL_FILE_NAME);
|
dentry = d_alloc_name(sb->s_root, NULL_FILE_NAME);
|
||||||
if (!dentry) {
|
if (!dentry) {
|
||||||
|
|
Loading…
Reference in a new issue