Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull compat time conversion changes from Peter Anvin:
 "Despite the branch name this is really neither an x86 nor an
  x32-specific patchset, although it the implementation of the
  discussions that followed the x32 security hole a few months ago.

  This removes get/put_compat_timespec/val() and replaces them with
  compat_get/put_timespec/val() which are savvy as to the current status
  of COMPAT_USE_64BIT_TIME.

  It removes several unused and/or incorrect/misleading functions (like
  compat_put_timeval_convert which doesn't in fact do any conversion)
  and also replaces several open-coded implementations what is now
  called compat_convert_timespec() with that function"

* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  compat: Fix sparse address space warnings
  compat: Get rid of (get|put)_compat_time(val|spec)

2 files changed, 6 insertions, 25 deletions

diff --git a/ipc/compat.c b/ipc/compat.c
index 98b9016cab6c..a4695ada3275 100644
--- a/ipc/compat.c
+++ b/ipc/compat.c
@@ -753,14 +753,8 @@ COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
                        unsigned, nsops,
                        const struct compat_timespec __user *, timeout)
 {
-        struct timespec __user *ts64 = NULL;
-        if (timeout) {
-                struct timespec ts;
-                ts64 = compat_alloc_user_space(sizeof(*ts64));
-                if (get_compat_timespec(&ts, timeout))
-                        return -EFAULT;
-                if (copy_to_user(ts64, &ts, sizeof(ts)))
-                        return -EFAULT;
-        }
+        struct timespec __user *ts64;
+        if (compat_convert_timespec(&ts64, timeout))
+                return -EFAULT;
         return sys_semtimedop(semid, tsems, nsops, ts64);
 }
diff --git a/ipc/compat_mq.c b/ipc/compat_mq.c
index d58747293772..90d29f59cac6 100644
--- a/ipc/compat_mq.c
+++ b/ipc/compat_mq.c
@@ -64,20 +64,6 @@ COMPAT_SYSCALL_DEFINE4(mq_open, const char __user *, u_name,
         return sys_mq_open(u_name, oflag, mode, p);
 }
 
-static int compat_prepare_timeout(struct timespec __user **p,
-                                  const struct compat_timespec __user *u)
-{
-        struct timespec ts;
-        if (!u) {
-                *p = NULL;
-                return 0;
-        }
-        *p = compat_alloc_user_space(sizeof(ts));
-        if (get_compat_timespec(&ts, u) || copy_to_user(*p, &ts, sizeof(ts)))
-                return -EFAULT;
-        return 0;
-}
-
 COMPAT_SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes,
                        const char __user *, u_msg_ptr,
                        compat_size_t, msg_len, unsigned int, msg_prio,
@@ -85,7 +71,7 @@ COMPAT_SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes,
 {
         struct timespec __user *u_ts;
 
-        if (compat_prepare_timeout(&u_ts, u_abs_timeout))
+        if (compat_convert_timespec(&u_ts, u_abs_timeout))
                 return -EFAULT;
 
         return sys_mq_timedsend(mqdes, u_msg_ptr, msg_len,
@@ -98,7 +84,8 @@ COMPAT_SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes,
                        const struct compat_timespec __user *, u_abs_timeout)
 {
         struct timespec __user *u_ts;
-        if (compat_prepare_timeout(&u_ts, u_abs_timeout))
+
+        if (compat_convert_timespec(&u_ts, u_abs_timeout))
                 return -EFAULT;
 
         return sys_mq_timedreceive(mqdes, u_msg_ptr, msg_len,