summary refs log tree commit diff
path: root/security
diff options
context:
space:
mode:
authorJames Morris <james.morris@microsoft.com>2019-04-10 14:59:20 -0700
committerJames Morris <james.morris@microsoft.com>2019-04-10 14:59:20 -0700
commitfe9fd2ef383c2f5883fcd3f7adce0de9ce2556ff (patch)
treec364553ccf78c5356050fe6d3b5a60da9927af2c /security
parentecb8e74dac1aaeea4005c9d8f21337f9423f3d8b (diff)
downloadlinux-fe9fd2ef383c2f5883fcd3f7adce0de9ce2556ff.tar.gz
Revert "security: inode: fix a missing check for securityfs_create_file"
This reverts commit d1a0846006e4325cc951ca0b05c02ed1d0865006.

From Al Viro:

"Rather bad way to do it - generally, register_filesystem() should be
the last thing done by initialization.  Any modular code that
does unregister_filesystem() on failure exit is flat-out broken;
here it's not instantly FUBAR, but it's a bloody bad example.

What's more, why not let simple_fill_super() do it?  Just
static int fill_super(struct super_block *sb, void *data, int silent)
{
        static const struct tree_descr files[] = {
                {"lsm", &lsm_ops, 0444},
                {""}
        };

and to hell with that call of securityfs_create_file() and all its
failure handling..."

Signed-off-by: James Morris <james.morris@microsoft.com>
Diffstat (limited to 'security')
-rw-r--r--security/inode.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/security/inode.c b/security/inode.c
index 667f8b15027d..b7772a9b315e 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -339,11 +339,6 @@ static int __init securityfs_init(void)
 #ifdef CONFIG_SECURITY
 	lsm_dentry = securityfs_create_file("lsm", 0444, NULL, NULL,
 						&lsm_ops);
-	if (IS_ERR(lsm_dentry)) {
-		unregister_filesystem(&fs_type);
-		sysfs_remove_mount_point(kernel_kobj, "security");
-		return PTR_ERR(lsm_dentry);
-	}
 #endif
 	return 0;
 }