diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-05-13 18:35:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-21 13:10:01 -0400 |
commit | 28dd1f346b2f0fc2ab8285046ed0bd91e9b808d3 (patch) | |
tree | 7c2a4337b103067684f0345283d19c8e8e62afb2 /security/selinux/selinuxfs.c | |
parent | 9924f6e89823a41bfd272ab759636276b9f9ee9c (diff) |
sysfs: Create mountpoints with sysfs_create_mount_point
commit f9bb48825a6b5d02f4cabcc78967c75db903dcdc upstream.
This allows for better documentation in the code and
it allows for a simpler and fully correct version of
fs_fully_visible to be written.
The mount points converted and their filesystems are:
/sys/hypervisor/s390/ s390_hypfs
/sys/kernel/config/ configfs
/sys/kernel/debug/ debugfs
/sys/firmware/efi/efivars/ efivarfs
/sys/fs/fuse/connections/ fusectl
/sys/fs/pstore/ pstore
/sys/kernel/tracing/ tracefs
/sys/fs/cgroup/ cgroup
/sys/kernel/security/ securityfs
/sys/fs/selinux/ selinuxfs
/sys/fs/smackfs/ smackfs
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security/selinux/selinuxfs.c')
-rw-r--r-- | security/selinux/selinuxfs.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index d2787cca1fcb..3d2201413028 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
@@ -1853,7 +1853,6 @@ static struct file_system_type sel_fs_type = { | |||
1853 | }; | 1853 | }; |
1854 | 1854 | ||
1855 | struct vfsmount *selinuxfs_mount; | 1855 | struct vfsmount *selinuxfs_mount; |
1856 | static struct kobject *selinuxfs_kobj; | ||
1857 | 1856 | ||
1858 | static int __init init_sel_fs(void) | 1857 | static int __init init_sel_fs(void) |
1859 | { | 1858 | { |
@@ -1862,13 +1861,13 @@ static int __init init_sel_fs(void) | |||
1862 | if (!selinux_enabled) | 1861 | if (!selinux_enabled) |
1863 | return 0; | 1862 | return 0; |
1864 | 1863 | ||
1865 | selinuxfs_kobj = kobject_create_and_add("selinux", fs_kobj); | 1864 | err = sysfs_create_mount_point(fs_kobj, "selinux"); |
1866 | if (!selinuxfs_kobj) | 1865 | if (err) |
1867 | return -ENOMEM; | 1866 | return err; |
1868 | 1867 | ||
1869 | err = register_filesystem(&sel_fs_type); | 1868 | err = register_filesystem(&sel_fs_type); |
1870 | if (err) { | 1869 | if (err) { |
1871 | kobject_put(selinuxfs_kobj); | 1870 | sysfs_remove_mount_point(fs_kobj, "selinux"); |
1872 | return err; | 1871 | return err; |
1873 | } | 1872 | } |
1874 | 1873 | ||
@@ -1887,7 +1886,7 @@ __initcall(init_sel_fs); | |||
1887 | #ifdef CONFIG_SECURITY_SELINUX_DISABLE | 1886 | #ifdef CONFIG_SECURITY_SELINUX_DISABLE |
1888 | void exit_sel_fs(void) | 1887 | void exit_sel_fs(void) |
1889 | { | 1888 | { |
1890 | kobject_put(selinuxfs_kobj); | 1889 | sysfs_remove_mount_point(fs_kobj, "selinux"); |
1891 | kern_unmount(selinuxfs_mount); | 1890 | kern_unmount(selinuxfs_mount); |
1892 | unregister_filesystem(&sel_fs_type); | 1891 | unregister_filesystem(&sel_fs_type); |
1893 | } | 1892 | } |