[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>

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 1bfb40701b5a40b7b356c6aa0d1c5e47058e9588..ab7c9935c29a774af4ca01a250e5f72b0374a48c 100644 (file)
--- 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) {