time: Change nanosleep to safe __kernel_* types

Change over clock_nanosleep syscalls to use y2038 safe
__kernel_timespec times. This will enable changing over
of these syscalls to use new y2038 safe syscalls when
the architectures define the CONFIG_64BIT_TIME.

Note that nanosleep syscall is deprecated and does not have a
plan for making it y2038 safe. But, the syscall should work as
before on 64 bit machines and on 32 bit machines, the syscall
works correctly until y2038 as before using the existing compat
syscall version. There is no new syscall for supporting 64 bit
time_t on 32 bit architectures.

Cc: [email protected]
Signed-off-by: Deepa Dinamani <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>

diff --git a/include/linux/restart_block.h b/include/linux/restart_block.h
index bcfdb918cd810ec5e7b006764e3be936edea34b7..5d83d0c1d06cc22507d8b8e03d75e0bf8de32fd8 100644 (file)
--- a/include/linux/restart_block.h
+++ b/include/linux/restart_block.h
@@ -7,6 +7,7 @@
 
 #include <linux/compiler.h>
 #include <linux/types.h>
+#include <linux/time64.h>
 
 struct timespec;
 struct compat_timespec;
@@ -15,9 +16,7 @@ struct pollfd;
 enum timespec_type {
        TT_NONE         = 0,
        TT_NATIVE       = 1,
-#ifdef CONFIG_COMPAT
        TT_COMPAT       = 2,
-#endif
 };
 
 /*
@@ -40,10 +39,8 @@ struct restart_block {
                        clockid_t clockid;
                        enum timespec_type type;
                        union {
-                               struct timespec __user *rmtp;
-#ifdef CONFIG_COMPAT
+                               struct __kernel_timespec __user *rmtp;
                                struct compat_timespec __user *compat_rmtp;
-#endif
                        };
                        u64 expires;
                } nanosleep;

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 40bb40d1741b0e01c4af5f7f2ba91ad0332b835d..c9a2a26018525be2a53aaa1b19b32b19353f043a 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -536,7 +536,8 @@ asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,
                                    size_t len);
 
 /* kernel/hrtimer.c */
-asmlinkage long sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp);
+asmlinkage long sys_nanosleep(struct __kernel_timespec __user *rqtp,
+                             struct __kernel_timespec __user *rmtp);
 
 /* kernel/itimer.c */
 asmlinkage long sys_getitimer(int which, struct itimerval __user *value);
@@ -573,8 +574,8 @@ asmlinkage long sys_clock_gettime(clockid_t which_clock,
 asmlinkage long sys_clock_getres(clockid_t which_clock,
                                struct __kernel_timespec __user *tp);
 asmlinkage long sys_clock_nanosleep(clockid_t which_clock, int flags,
-                               const struct timespec __user *rqtp,
-                               struct timespec __user *rmtp);
+                               const struct __kernel_timespec __user *rqtp,
+                               struct __kernel_timespec __user *rmtp);
 
 /* kernel/printk.c */
 asmlinkage long sys_syslog(int type, char __user *buf, int len);

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index f183257ff0c6d4426f9470cc148c9d27dddbe5a5..d7051b3993b544b91c811183511fa04710122035 100644 (file)
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1747,8 +1747,10 @@ out:
        return ret;
 }
 
-SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
-               struct timespec __user *, rmtp)
+#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT)
+
+SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp,
+               struct __kernel_timespec __user *, rmtp)
 {
        struct timespec64 tu;
 
@@ -1763,6 +1765,8 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
        return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
 }
 
+#endif
+
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
 COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,

diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
index 4e76021cea7f3c543283f0e9d58f4ca54808ef9c..474e4ca2e28f33fa470073ad1e533dfe620bb352 100644 (file)
--- a/kernel/time/posix-stubs.c
+++ b/kernel/time/posix-stubs.c
@@ -126,8 +126,8 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct __kernel_time
 }
 
 SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
-               const struct timespec __user *, rqtp,
-               struct timespec __user *, rmtp)
+               const struct __kernel_timespec __user *, rqtp,
+               struct __kernel_timespec __user *, rmtp)
 {
        struct timespec64 t;
 

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 93b2c38ad0f3511c840fccb2ce992189bea6b8a0..c21f4c4f86607fa5a1bdf1799f550ddd86027511 100644 (file)
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -1212,8 +1212,8 @@ static int common_nsleep(const clockid_t which_clock, int flags,
 }
 
 SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
-               const struct timespec __user *, rqtp,
-               struct timespec __user *, rmtp)
+               const struct __kernel_timespec __user *, rqtp,
+               struct __kernel_timespec __user *, rmtp)
 {
        const struct k_clock *kc = clockid_to_kclock(which_clock);
        struct timespec64 t;