lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] selinuxfs cleanups: sel_make_bools

Browse Source 
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:
James Morris
2006-03-22 00:09:18 -08:00
committed by Linus Torvalds
parent 161ce45a8a
commit 253a8b1db1
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
security/selinux/selinuxfs.c
View File

@@ -970,7 +970,7 @@ out:
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) {