Merge branch 'master' into for-4.20/upstream-fixes

[linux.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index cc41de3b8debf135e1b569e76e43cc03c7e1d171..c595bed7bfcbc0aaa6891f447c6945c672f089e1 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1461,10 +1461,10 @@ COMPAT_SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
 #endif
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-static int compat_prepare_timeout(const struct compat_timespec __user *p,
+static int compat_prepare_timeout(const struct old_timespec32 __user *p,
                                   struct timespec64 *ts)
 {
-       if (compat_get_timespec64(ts, p))
+       if (get_old_timespec32(ts, p))
                return -EFAULT;
        if (!timespec64_valid(ts))
                return -EINVAL;
@@ -1474,7 +1474,7 @@ static int compat_prepare_timeout(const struct compat_timespec __user *p,
 COMPAT_SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes,
                       const char __user *, u_msg_ptr,
                       compat_size_t, msg_len, unsigned int, msg_prio,
-                      const struct compat_timespec __user *, u_abs_timeout)
+                      const struct old_timespec32 __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
        if (u_abs_timeout) {
@@ -1489,7 +1489,7 @@ COMPAT_SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes,
 COMPAT_SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes,
                       char __user *, u_msg_ptr,
                       compat_size_t, msg_len, unsigned int __user *, u_msg_prio,
-                      const struct compat_timespec __user *, u_abs_timeout)
+                      const struct old_timespec32 __user *, u_abs_timeout)
 {
        struct timespec64 ts, *p = NULL;
        if (u_abs_timeout) {