aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/selinuxfs.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2006-03-22 00:09:18 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 07:54:07 -0800
commit253a8b1db1af146d3a7eef0f3626781df12c7141 (patch)
tree9aea4b9864a3dc12df89c73e5cf156bd3e7932ad /security/selinux/selinuxfs.c
parent161ce45a8a34ba81673f60c603e6fc6d37d99c8f (diff)
[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>
Diffstat (limited to 'security/selinux/selinuxfs.c')
-rw-r--r--security/selinux/selinuxfs.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 1bfb40701b5a..ab7c9935c29a 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -970,7 +970,7 @@ out:
return ret;
err:
kfree(values);
- d_genocide(dir);
+ sel_remove_bools(dir);
ret = -ENOMEM;
goto out;
}
@@ -1226,9 +1226,6 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
goto err;
bool_dir = dentry;
- ret = sel_make_bools();
- if (ret)
- goto err;
dentry = d_alloc_name(sb->s_root, NULL_FILE_NAME);
if (!dentry) {

Privacy Policy