vfs: Remove unused code after filesystem context changes

Remove code that is now unused after the filesystem context changes.

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/fs/internal.h b/fs/internal.h
index fc2da60abbcd031da863262192b79c69d6bf9beb..73942ff5aa099cde97170836ffc9e9f8b86b051d 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -116,8 +116,6 @@ extern struct file *alloc_empty_file_noaccount(int, const struct cred *);
  */
 extern int reconfigure_super(struct fs_context *);
 extern bool trylock_super(struct super_block *sb);
-extern struct dentry *mount_fs(struct file_system_type *,
-                              int, const char *, void *, size_t);
 extern struct super_block *user_get_super(dev_t);
 
 /*

diff --git a/fs/super.c b/fs/super.c
index 261612e7e70123c17789a21f20fc4c7892e1c4f6..4a01ec1dad29d037b95700a96cc4247e7fe7b38b 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -1478,68 +1478,6 @@ error:
 }
 EXPORT_SYMBOL(mount_single);
 
-struct dentry *
-mount_fs(struct file_system_type *type, int flags, const char *name,
-        void *data, size_t data_size)
-{
-       struct dentry *root;
-       struct super_block *sb;
-       char *secdata = NULL;
-       int error = -ENOMEM;
-
-       if (data && !(type->fs_flags & FS_BINARY_MOUNTDATA)) {
-               secdata = alloc_secdata();
-               if (!secdata)
-                       goto out;
-
-               error = security_sb_copy_data(data, data_size, secdata);
-               if (error)
-                       goto out_free_secdata;
-       }
-
-       root = type->mount(type, flags, name, data, data_size);
-       if (IS_ERR(root)) {
-               error = PTR_ERR(root);
-               goto out_free_secdata;
-       }
-       sb = root->d_sb;
-       BUG_ON(!sb);
-       WARN_ON(!sb->s_bdi);
-
-       /*
-        * Write barrier is for super_cache_count(). We place it before setting
-        * SB_BORN as the data dependency between the two functions is the
-        * superblock structure contents that we just set up, not the SB_BORN
-        * flag.
-        */
-       smp_wmb();
-       sb->s_flags |= SB_BORN;
-
-       error = security_sb_kern_mount(sb, flags, secdata, data_size);
-       if (error)
-               goto out_sb;
-
-       /*
-        * filesystems should never set s_maxbytes larger than MAX_LFS_FILESIZE
-        * but s_maxbytes was an unsigned long long for many releases. Throw
-        * this warning for a little while to try and catch filesystems that
-        * violate this rule.
-        */
-       WARN((sb->s_maxbytes < 0), "%s set sb->s_maxbytes to "
-               "negative value (%lld)\n", type->name, sb->s_maxbytes);
-
-       up_write(&sb->s_umount);
-       free_secdata(secdata);
-       return root;
-out_sb:
-       dput(root);
-       deactivate_locked_super(sb);
-out_free_secdata:
-       free_secdata(secdata);
-out:
-       return ERR_PTR(error);
-}
-
 /*
  * Setup private BDI for given superblock. It gets automatically cleaned up
  * in generic_shutdown_super().

diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index 7e50bfa1aee08d4e462de4b3e5b2647a86b8296a..fff43b0523a9b9f777d11b4833cece77ed0fbf28 100644 (file)
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -160,13 +160,6 @@
  *     @orig_data is the size of the original data
  *     @copy copied data which will be passed to the security module.
  *     Returns 0 if the copy was successful.
- * @sb_remount:
- *     Extracts security system specific mount options and verifies no changes
- *     are being made to those options.
- *     @sb superblock being remounted
- *     @data contains the filesystem-specific data.
- *     @data_size contains the size of the data.
- *     Return 0 if permission is granted.
  * @sb_umount:
  *     Check permission before the @mnt file system is unmounted.
  *     @mnt contains the mounted file system.
@@ -1522,9 +1515,6 @@ union security_list_options {
        int (*sb_alloc_security)(struct super_block *sb);
        void (*sb_free_security)(struct super_block *sb);
        int (*sb_copy_data)(char *orig, size_t orig_size, char *copy);
-       int (*sb_remount)(struct super_block *sb, void *data, size_t data_size);
-       int (*sb_kern_mount)(struct super_block *sb, int flags,
-                            void *data, size_t data_size);
        int (*sb_show_options)(struct seq_file *m, struct super_block *sb);
        int (*sb_statfs)(struct dentry *dentry);
        int (*sb_mount)(const char *dev_name, const struct path *path,
@@ -1872,8 +1862,6 @@ struct security_hook_heads {
        struct hlist_head sb_alloc_security;
        struct hlist_head sb_free_security;
        struct hlist_head sb_copy_data;
-       struct hlist_head sb_remount;
-       struct hlist_head sb_kern_mount;
        struct hlist_head sb_show_options;
        struct hlist_head sb_statfs;
        struct hlist_head sb_mount;

diff --git a/include/linux/security.h b/include/linux/security.h
index bae191a96c73df9735d1fc5c569e81300b41f7ff..11157798d4f80c257c4cbbcb860d9fd65828aa4f 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -261,8 +261,6 @@ int security_sb_mountpoint(struct fs_context *fc, struct path *mountpoint,
 int security_sb_alloc(struct super_block *sb);
 void security_sb_free(struct super_block *sb);
 int security_sb_copy_data(char *orig, size_t orig_size, char *copy);
-int security_sb_remount(struct super_block *sb, void *data, size_t data_size);
-int security_sb_kern_mount(struct super_block *sb, int flags, void *data, size_t data_size);
 int security_sb_show_options(struct seq_file *m, struct super_block *sb);
 int security_sb_statfs(struct dentry *dentry);
 int security_sb_mount(const char *dev_name, const struct path *path,
@@ -608,17 +606,6 @@ static inline int security_sb_copy_data(char *orig, size_t orig_size, char *copy
        return 0;
 }
 
-static inline int security_sb_remount(struct super_block *sb, void *data, size_t data_size)
-{
-       return 0;
-}
-
-static inline int security_sb_kern_mount(struct super_block *sb, int flags,
-                                        void *data, size_t data_size)
-{
-       return 0;
-}
-
 static inline int security_sb_show_options(struct seq_file *m,
                                           struct super_block *sb)
 {

diff --git a/security/security.c b/security/security.c
index 64304d20aae186563e5433d7d8e55b3209df0f57..d902810f2749d8e9bf3e02e868a6913fb1761f16 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -420,16 +420,6 @@ int security_sb_copy_data(char *orig, size_t data_size, char *copy)
 }
 EXPORT_SYMBOL(security_sb_copy_data);
 
-int security_sb_remount(struct super_block *sb, void *data, size_t data_size)
-{
-       return call_int_hook(sb_remount, 0, sb, data, data_size);
-}
-
-int security_sb_kern_mount(struct super_block *sb, int flags, void *data, size_t data_size)
-{
-       return call_int_hook(sb_kern_mount, 0, sb, flags, data, data_size);
-}
-
 int security_sb_show_options(struct seq_file *m, struct super_block *sb)
 {
        return call_int_hook(sb_show_options, 0, m, sb);

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 5f2af9dd44fad543b4def88caa524cf77ec1aa38..99c2c40c5d7aeeb66bf138d080c6df5fb5d496bd 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2832,110 +2832,6 @@ out:
        return rc;
 }
 
-static int selinux_sb_remount(struct super_block *sb, void *data, size_t data_size)
-{
-       int rc, i, *flags;
-       struct security_mnt_opts opts;
-       char *secdata, **mount_options;
-       struct superblock_security_struct *sbsec = sb->s_security;
-
-       if (!(sbsec->flags & SE_SBINITIALIZED))
-               return 0;
-
-       if (!data)
-               return 0;
-
-       if (sb->s_type->fs_flags & FS_BINARY_MOUNTDATA)
-               return 0;
-
-       security_init_mnt_opts(&opts);
-       secdata = alloc_secdata();
-       if (!secdata)
-               return -ENOMEM;
-       rc = selinux_sb_copy_data(data, data_size, secdata);
-       if (rc)
-               goto out_free_secdata;
-
-       rc = selinux_parse_opts_str(secdata, &opts);
-       if (rc)
-               goto out_free_secdata;
-
-       mount_options = opts.mnt_opts;
-       flags = opts.mnt_opts_flags;
-
-       for (i = 0; i < opts.num_mnt_opts; i++) {
-               u32 sid;
-
-               if (flags[i] == SBLABEL_MNT)
-                       continue;
-               rc = security_context_str_to_sid(&selinux_state,
-                                                mount_options[i], &sid,
-                                                GFP_KERNEL);
-               if (rc) {
-                       pr_warn("SELinux: security_context_str_to_sid"
-                              "(%s) failed for (dev %s, type %s) errno=%d\n",
-                              mount_options[i], sb->s_id, sb->s_type->name, rc);
-                       goto out_free_opts;
-               }
-               rc = -EINVAL;
-               switch (flags[i]) {
-               case FSCONTEXT_MNT:
-                       if (bad_option(sbsec, FSCONTEXT_MNT, sbsec->sid, sid))
-                               goto out_bad_option;
-                       break;
-               case CONTEXT_MNT:
-                       if (bad_option(sbsec, CONTEXT_MNT, sbsec->mntpoint_sid, sid))
-                               goto out_bad_option;
-                       break;
-               case ROOTCONTEXT_MNT: {
-                       struct inode_security_struct *root_isec;
-                       root_isec = backing_inode_security(sb->s_root);
-
-                       if (bad_option(sbsec, ROOTCONTEXT_MNT, root_isec->sid, sid))
-                               goto out_bad_option;
-                       break;
-               }
-               case DEFCONTEXT_MNT:
-                       if (bad_option(sbsec, DEFCONTEXT_MNT, sbsec->def_sid, sid))
-                               goto out_bad_option;
-                       break;
-               default:
-                       goto out_free_opts;
-               }
-       }
-
-       rc = 0;
-out_free_opts:
-       security_free_mnt_opts(&opts);
-out_free_secdata:
-       free_secdata(secdata);
-       return rc;
-out_bad_option:
-       pr_warn("SELinux: unable to change security options "
-              "during remount (dev %s, type=%s)\n", sb->s_id,
-              sb->s_type->name);
-       goto out_free_opts;
-}
-
-static int selinux_sb_kern_mount(struct super_block *sb, int flags, void *data, size_t data_size)
-{
-       const struct cred *cred = current_cred();
-       struct common_audit_data ad;
-       int rc;
-
-       rc = superblock_doinit(sb, data);
-       if (rc)
-               return rc;
-
-       /* Allow all mounts performed by the kernel */
-       if (flags & MS_KERNMOUNT)
-               return 0;
-
-       ad.type = LSM_AUDIT_DATA_DENTRY;
-       ad.u.dentry = sb->s_root;
-       return superblock_has_perm(cred, sb, FILESYSTEM__MOUNT, &ad);
-}
-
 static int selinux_sb_statfs(struct dentry *dentry)
 {
        const struct cred *cred = current_cred();
@@ -7205,8 +7101,6 @@ static struct security_hook_list selinux_hooks[] __lsm_ro_after_init = {
        LSM_HOOK_INIT(sb_alloc_security, selinux_sb_alloc_security),
        LSM_HOOK_INIT(sb_free_security, selinux_sb_free_security),
        LSM_HOOK_INIT(sb_copy_data, selinux_sb_copy_data),
-       LSM_HOOK_INIT(sb_remount, selinux_sb_remount),
-       LSM_HOOK_INIT(sb_kern_mount, selinux_sb_kern_mount),
        LSM_HOOK_INIT(sb_show_options, selinux_sb_show_options),
        LSM_HOOK_INIT(sb_statfs, selinux_sb_statfs),
        LSM_HOOK_INIT(sb_mount, selinux_mount),

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index da7121d24bce9a3ac3f1a85cb3a6b6b25370bd31..1f51a8ac11d7ec4e2d844706698ffcaac62c73a5 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1164,38 +1164,6 @@ static int smack_set_mnt_opts(struct super_block *sb,
        return 0;
 }
 
-/**
- * smack_sb_kern_mount - Smack specific mount processing
- * @sb: the file system superblock
- * @flags: the mount flags
- * @data: the smack mount options
- *
- * Returns 0 on success, an error code on failure
- */
-static int smack_sb_kern_mount(struct super_block *sb, int flags,
-                              void *data, size_t data_size)
-{
-       int rc = 0;
-       char *options = data;
-       struct security_mnt_opts opts;
-
-       security_init_mnt_opts(&opts);
-
-       if (!options)
-               goto out;
-
-       rc = smack_parse_opts_str(options, &opts);
-       if (rc)
-               goto out_err;
-
-out:
-       rc = smack_set_mnt_opts(sb, &opts, 0, NULL);
-
-out_err:
-       security_free_mnt_opts(&opts);
-       return rc;
-}
-
 /**
  * smack_sb_statfs - Smack check on statfs
  * @dentry: identifies the file system in question
@@ -4985,7 +4953,6 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {
        LSM_HOOK_INIT(sb_alloc_security, smack_sb_alloc_security),
        LSM_HOOK_INIT(sb_free_security, smack_sb_free_security),
        LSM_HOOK_INIT(sb_copy_data, smack_sb_copy_data),
-       LSM_HOOK_INIT(sb_kern_mount, smack_sb_kern_mount),
        LSM_HOOK_INIT(sb_statfs, smack_sb_statfs),
        LSM_HOOK_INIT(sb_set_mnt_opts, smack_set_mnt_opts),
        LSM_HOOK_INIT(sb_parse_opts_str, smack_parse_opts_str),