Merge branch 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull compat and uaccess updates from Al Viro:

 - {get,put}_compat_sigset() series

 - assorted compat ioctl stuff

 - more set_fs() elimination

 - a few more timespec64 conversions

 - several removals of pointless access_ok() in places where it was
   followed only by non-__ variants of primitives

* 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (24 commits)
  coredump: call do_unlinkat directly instead of sys_unlink
  fs: expose do_unlinkat for built-in callers
  ext4: take handling of EXT4_IOC_GROUP_ADD into a helper, get rid of set_fs()
  ipmi: get rid of pointless access_ok()
  pi433: sanitize ioctl
  cxlflash: get rid of pointless access_ok()
  mtdchar: get rid of pointless access_ok()
  r128: switch compat ioctls to drm_ioctl_kernel()
  selection: get rid of field-by-field copyin
  VT_RESIZEX: get rid of field-by-field copyin
  i2c compat ioctls: move to ->compat_ioctl()
  sched_rr_get_interval(): move compat to native, get rid of set_fs()
  mips: switch to {get,put}_compat_sigset()
  sparc: switch to {get,put}_compat_sigset()
  s390: switch to {get,put}_compat_sigset()
  ppc: switch to {get,put}_compat_sigset()
  parisc: switch to {get,put}_compat_sigset()
  get_compat_sigset()
  get rid of {get,put}_compat_itimerspec()
  io_getevents: Use timespec64 to represent timeouts
  ...

1 files changed, 43 insertions, 43 deletions

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index b7558f292420..1eec25014f62 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -592,6 +592,44 @@ static int ext4_ioc_getfsmap(struct super_block *sb,
         return 0;
 }
 
+static long ext4_ioctl_group_add(struct file *file,
+                                 struct ext4_new_group_data *input)
+{
+        struct super_block *sb = file_inode(file)->i_sb;
+        int err, err2=0;
+
+        err = ext4_resize_begin(sb);
+        if (err)
+                return err;
+
+        if (ext4_has_feature_bigalloc(sb)) {
+                ext4_msg(sb, KERN_ERR,
+                         "Online resizing not supported with bigalloc");
+                err = -EOPNOTSUPP;
+                goto group_add_out;
+        }
+
+        err = mnt_want_write_file(file);
+        if (err)
+                goto group_add_out;
+
+        err = ext4_group_add(sb, input);
+        if (EXT4_SB(sb)->s_journal) {
+                jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal);
+                err2 = jbd2_journal_flush(EXT4_SB(sb)->s_journal);
+                jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal);
+        }
+        if (err == 0)
+                err = err2;
+        mnt_drop_write_file(file);
+        if (!err && ext4_has_group_desc_csum(sb) &&
+            test_opt(sb, INIT_INODE_TABLE))
+                err = ext4_register_li_request(sb, input->group);
+group_add_out:
+        ext4_resize_end(sb);
+        return err;
+}
+
 long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
         struct inode *inode = file_inode(filp);
@@ -776,44 +814,12 @@ mext_out:
 
         case EXT4_IOC_GROUP_ADD: {
                 struct ext4_new_group_data input;
-                int err, err2=0;
-
-                err = ext4_resize_begin(sb);
-                if (err)
-                        return err;
 
                 if (copy_from_user(&input, (struct ext4_new_group_input __user *)arg,
-                                sizeof(input))) {
-                        err = -EFAULT;
-                        goto group_add_out;
-                }
-
-                if (ext4_has_feature_bigalloc(sb)) {
-                        ext4_msg(sb, KERN_ERR,
-                                 "Online resizing not supported with bigalloc");
-                        err = -EOPNOTSUPP;
-                        goto group_add_out;
-                }
-
-                err = mnt_want_write_file(filp);
-                if (err)
-                        goto group_add_out;
+                                sizeof(input)))
+                        return -EFAULT;
 
-                err = ext4_group_add(sb, &input);
-                if (EXT4_SB(sb)->s_journal) {
-                        jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal);
-                        err2 = jbd2_journal_flush(EXT4_SB(sb)->s_journal);
-                        jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal);
-                }
-                if (err == 0)
-                        err = err2;
-                mnt_drop_write_file(filp);
-                if (!err && ext4_has_group_desc_csum(sb) &&
-                    test_opt(sb, INIT_INODE_TABLE))
-                        err = ext4_register_li_request(sb, input.group);
-group_add_out:
-                ext4_resize_end(sb);
-                return err;
+                return ext4_ioctl_group_add(filp, &input);
         }
 
         case EXT4_IOC_MIGRATE:
@@ -1078,8 +1084,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 break;
         case EXT4_IOC32_GROUP_ADD: {
                 struct compat_ext4_new_group_input __user *uinput;
-                struct ext4_new_group_input input;
-                mm_segment_t old_fs;
+                struct ext4_new_group_data input;
                 int err;
 
                 uinput = compat_ptr(arg);
@@ -1092,12 +1097,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 &uinput->reserved_blocks);
                 if (err)
                         return -EFAULT;
-                old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                err = ext4_ioctl(file, EXT4_IOC_GROUP_ADD,
-                                 (unsigned long) &input);
-                set_fs(old_fs);
-                return err;
+                return ext4_ioctl_group_add(file, &input);
         }
         case EXT4_IOC_MOVE_EXT:
         case EXT4_IOC_RESIZE_FS: