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

Pull timer-related user access updates from Al Viro:
 "Continuation of timers-related stuff (there had been more, but my
  parts of that series are already merged via timers/core). This is more
  of y2038 work by Deepa Dinamani, partially disrupted by the
  unification of native and compat timers-related syscalls"

* 'timers-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  posix_clocks: Use get_itimerspec64() and put_itimerspec64()
  timerfd: Use get_itimerspec64() and put_itimerspec64()
  nanosleep: Use get_timespec64() and put_timespec64()
  posix-timers: Use get_timespec64() and put_timespec64()
  posix-stubs: Conditionally include COMPAT_SYS_NI defines
  time: introduce {get,put}_itimerspec64
  time: add get_timespec64 and put_timespec64

1 files changed, 65 insertions, 0 deletions

diff --git a/kernel/compat.c b/kernel/compat.c
index 9ce1d4876e60..0621c8e1ab72 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -120,6 +120,50 @@ static int __compat_put_timespec(const struct timespec *ts, struct compat_timesp
                         __put_user(ts->tv_nsec, &cts->tv_nsec)) ? -EFAULT : 0;
 }
 
+static int __compat_get_timespec64(struct timespec64 *ts64,
+                                   const struct compat_timespec __user *cts)
+{
+        struct compat_timespec ts;
+        int ret;
+
+        ret = copy_from_user(&ts, cts, sizeof(ts));
+        if (ret)
+                return -EFAULT;
+
+        ts64->tv_sec = ts.tv_sec;
+        ts64->tv_nsec = ts.tv_nsec;
+
+        return 0;
+}
+
+static int __compat_put_timespec64(const struct timespec64 *ts64,
+                                   struct compat_timespec __user *cts)
+{
+        struct compat_timespec ts = {
+                .tv_sec = ts64->tv_sec,
+                .tv_nsec = ts64->tv_nsec
+        };
+        return copy_to_user(cts, &ts, sizeof(ts)) ? -EFAULT : 0;
+}
+
+int compat_get_timespec64(struct timespec64 *ts, const void __user *uts)
+{
+        if (COMPAT_USE_64BIT_TIME)
+                return copy_from_user(ts, uts, sizeof(*ts)) ? -EFAULT : 0;
+        else
+                return __compat_get_timespec64(ts, uts);
+}
+EXPORT_SYMBOL_GPL(compat_get_timespec64);
+
+int compat_put_timespec64(const struct timespec64 *ts, void __user *uts)
+{
+        if (COMPAT_USE_64BIT_TIME)
+                return copy_to_user(uts, ts, sizeof(*ts)) ? -EFAULT : 0;
+        else
+                return __compat_put_timespec64(ts, uts);
+}
+EXPORT_SYMBOL_GPL(compat_put_timespec64);
+
 int compat_get_timeval(struct timeval *tv, const void __user *utv)
 {
         if (COMPAT_USE_64BIT_TIME)
@@ -476,6 +520,27 @@ int put_compat_itimerspec(struct compat_itimerspec __user *dst,
         return 0;
 }
 
+int get_compat_itimerspec64(struct itimerspec64 *its,
+                        const struct compat_itimerspec __user *uits)
+{
+
+        if (__compat_get_timespec64(&its->it_interval, &uits->it_interval) ||
+            __compat_get_timespec64(&its->it_value, &uits->it_value))
+                return -EFAULT;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(get_compat_itimerspec64);
+
+int put_compat_itimerspec64(const struct itimerspec64 *its,
+                        struct compat_itimerspec __user *uits)
+{
+        if (__compat_put_timespec64(&its->it_interval, &uits->it_interval) ||
+            __compat_put_timespec64(&its->it_value, &uits->it_value))
+                return -EFAULT;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(put_compat_itimerspec64);
+
 /*
  * We currently only need the following fields from the sigevent
  * structure: sigev_value, sigev_signo, sig_notify and (sometimes