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, 30 insertions, 25 deletions

diff --git a/fs/aio.c b/fs/aio.c
index e6de7715228c..a062d75109cb 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1297,20 +1297,10 @@ static bool aio_read_events(struct kioctx *ctx, long min_nr, long nr,
 
 static long read_events(struct kioctx *ctx, long min_nr, long nr,
                         struct io_event __user *event,
-                        struct timespec __user *timeout)
+                        ktime_t until)
 {
-        ktime_t until = KTIME_MAX;
         long ret = 0;
 
-        if (timeout) {
-                struct timespec ts;
-
-                if (unlikely(copy_from_user(&ts, timeout, sizeof(ts))))
-                        return -EFAULT;
-
-                until = timespec_to_ktime(ts);
-        }
-
         /*
          * Note that aio_read_events() is being called as the conditional - i.e.
          * we're calling it after prepare_to_wait() has set task state to
@@ -1826,6 +1816,25 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
         return ret;
 }
 
+static long do_io_getevents(aio_context_t ctx_id,
+                long min_nr,
+                long nr,
+                struct io_event __user *events,
+                struct timespec64 *ts)
+{
+        ktime_t until = ts ? timespec64_to_ktime(*ts) : KTIME_MAX;
+        struct kioctx *ioctx = lookup_ioctx(ctx_id);
+        long ret = -EINVAL;
+
+        if (likely(ioctx)) {
+                if (likely(min_nr <= nr && min_nr >= 0))
+                        ret = read_events(ioctx, min_nr, nr, events, until);
+                percpu_ref_put(&ioctx->users);
+        }
+
+        return ret;
+}
+
 /* io_getevents:
  *      Attempts to read at least min_nr events and up to nr events from
  *      the completion queue for the aio_context specified by ctx_id. If
@@ -1844,15 +1853,14 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
                 struct io_event __user *, events,
                 struct timespec __user *, timeout)
 {
-        struct kioctx *ioctx = lookup_ioctx(ctx_id);
-        long ret = -EINVAL;
+        struct timespec64       ts;
 
-        if (likely(ioctx)) {
-                if (likely(min_nr <= nr && min_nr >= 0))
-                        ret = read_events(ioctx, min_nr, nr, events, timeout);
-                percpu_ref_put(&ioctx->users);
+        if (timeout) {
+                if (unlikely(get_timespec64(&ts, timeout)))
+                        return -EFAULT;
         }
-        return ret;
+
+        return do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);
 }
 
 #ifdef CONFIG_COMPAT
@@ -1862,17 +1870,14 @@ COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id,
                        struct io_event __user *, events,
                        struct compat_timespec __user *, timeout)
 {
-        struct timespec t;
-        struct timespec __user *ut = NULL;
+        struct timespec64 t;
 
         if (timeout) {
-                if (compat_get_timespec(&t, timeout))
+                if (compat_get_timespec64(&t, timeout))
                         return -EFAULT;
 
-                ut = compat_alloc_user_space(sizeof(*ut));
-                if (copy_to_user(ut, &t, sizeof(t)))
-                        return -EFAULT;
         }
-        return sys_io_getevents(ctx_id, min_nr, nr, events, ut);
+
+        return do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);
 }
 #endif