From fe9fd2ef383c2f5883fcd3f7adce0de9ce2556ff Mon Sep 17 00:00:00 2001
From: James Morris <james.morris@microsoft.com>
Date: Wed, 10 Apr 2019 14:59:20 -0700
Subject: [PATCH] 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>
---
security/inode.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/security/inode.c b/security/inode.c
index 667f8b15027d8..b7772a9b315ee 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;
}
--
GitLab