Merge branch 'mount.part1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 368a5b9e6c13eb2bfaa8ec811396554bfb8a05df..c5586ffd1426fce1c5076f8b18e536affa99600b 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1458,56 +1458,6 @@ out:
        return root;
 }
 
-static int parse_security_options(char *orig_opts,
-                                 struct security_mnt_opts *sec_opts)
-{
-       char *secdata = NULL;
-       int ret = 0;
-
-       secdata = alloc_secdata();
-       if (!secdata)
-               return -ENOMEM;
-       ret = security_sb_copy_data(orig_opts, secdata);
-       if (ret) {
-               free_secdata(secdata);
-               return ret;
-       }
-       ret = security_sb_parse_opts_str(secdata, sec_opts);
-       free_secdata(secdata);
-       return ret;
-}
-
-static int setup_security_options(struct btrfs_fs_info *fs_info,
-                                 struct super_block *sb,
-                                 struct security_mnt_opts *sec_opts)
-{
-       int ret = 0;
-
-       /*
-        * Call security_sb_set_mnt_opts() to check whether new sec_opts
-        * is valid.
-        */
-       ret = security_sb_set_mnt_opts(sb, sec_opts, 0, NULL);
-       if (ret)
-               return ret;
-
-#ifdef CONFIG_SECURITY
-       if (!fs_info->security_opts.num_mnt_opts) {
-               /* first time security setup, copy sec_opts to fs_info */
-               memcpy(&fs_info->security_opts, sec_opts, sizeof(*sec_opts));
-       } else {
-               /*
-                * Since SELinux (the only one supporting security_mnt_opts)
-                * does NOT support changing context during remount/mount of
-                * the same sb, this must be the same or part of the same
-                * security options, just free it.
-                */
-               security_free_mnt_opts(sec_opts);
-       }
-#endif
-       return ret;
-}
-
 /*
  * Find a superblock for the given device / mount point.
  *
@@ -1522,16 +1472,15 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,
        struct btrfs_device *device = NULL;
        struct btrfs_fs_devices *fs_devices = NULL;
        struct btrfs_fs_info *fs_info = NULL;
-       struct security_mnt_opts new_sec_opts;
+       void *new_sec_opts = NULL;
        fmode_t mode = FMODE_READ;
        int error = 0;
 
        if (!(flags & SB_RDONLY))
                mode |= FMODE_WRITE;
 
-       security_init_mnt_opts(&new_sec_opts);
        if (data) {
-               error = parse_security_options(data, &new_sec_opts);
+               error = security_sb_eat_lsm_opts(data, &new_sec_opts);
                if (error)
                        return ERR_PTR(error);
        }
@@ -1550,7 +1499,6 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,
 
        fs_info->super_copy = kzalloc(BTRFS_SUPER_INFO_SIZE, GFP_KERNEL);
        fs_info->super_for_commit = kzalloc(BTRFS_SUPER_INFO_SIZE, GFP_KERNEL);
-       security_init_mnt_opts(&fs_info->security_opts);
        if (!fs_info->super_copy || !fs_info->super_for_commit) {
                error = -ENOMEM;
                goto error_fs_info;
@@ -1601,16 +1549,12 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,
                btrfs_sb(s)->bdev_holder = fs_type;
                error = btrfs_fill_super(s, fs_devices, data);
        }
+       if (!error)
+               error = security_sb_set_mnt_opts(s, new_sec_opts, 0, NULL);
+       security_free_mnt_opts(&new_sec_opts);
        if (error) {
                deactivate_locked_super(s);
-               goto error_sec_opts;
-       }
-
-       fs_info = btrfs_sb(s);
-       error = setup_security_options(fs_info, s, &new_sec_opts);
-       if (error) {
-               deactivate_locked_super(s);
-               goto error_sec_opts;
+               return ERR_PTR(error);
        }
 
        return dget(s->s_root);
@@ -1779,18 +1723,14 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
        btrfs_remount_prepare(fs_info);
 
        if (data) {
-               struct security_mnt_opts new_sec_opts;
+               void *new_sec_opts = NULL;
 
-               security_init_mnt_opts(&new_sec_opts);
-               ret = parse_security_options(data, &new_sec_opts);
+               ret = security_sb_eat_lsm_opts(data, &new_sec_opts);
+               if (!ret)
+                       ret = security_sb_remount(sb, new_sec_opts);
+               security_free_mnt_opts(&new_sec_opts);
                if (ret)
                        goto restore;
-               ret = setup_security_options(fs_info, sb,
-                                            &new_sec_opts);
-               if (ret) {
-                       security_free_mnt_opts(&new_sec_opts);
-                       goto restore;
-               }
        }
 
        ret = btrfs_parse_options(fs_info, data, *flags);