time: Change nanosleep to safe __kernel_* types

deepa-hub · arndb · commit 01909974b410 · 2018-04-19T13:32:03.000+02:00
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: linux-api@vger.kernel.org
Signed-off-by: Deepa Dinamani &lt;deepa.kernel@gmail.com&gt;
Signed-off-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
diff --git 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
@@ -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
@@ -1747,8 +1747,10 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp,
 	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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1747,8 +1747,10 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp,`
`1747`	`1747`	`return ret;`
`1748`	`1748`	`}`
`1749`	`1749`
`1750`		`-SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,`
`1751`		`- struct timespec __user *, rmtp)`
	`1750`	`+#if !defined(CONFIG_64BIT_TIME) \|\| defined(CONFIG_64BIT)`
	`1751`	`+`
	`1752`	`+SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp,`
	`1753`	`+ struct __kernel_timespec __user *, rmtp)`
`1752`	`1754`	`{`
`1753`	`1755`	`struct timespec64 tu;`
`1754`	`1756`
`@@ -1763,6 +1765,8 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,`
`1763`	`1765`	`return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC);`
`1764`	`1766`	`}`
`1765`	`1767`
	`1768`	`+#endif`
	`1769`	`+`
`1766`	`1770`	`#ifdef CONFIG_COMPAT_32BIT_TIME`
`1767`	`1771`
`1768`	`1772`	`COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,8 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct __kernel_time`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,`
`129`		`- const struct timespec __user *, rqtp,`
`130`		`- struct timespec __user *, rmtp)`
	`129`	`+ const struct __kernel_timespec __user *, rqtp,`
	`130`	`+ struct __kernel_timespec __user *, rmtp)`
`131`	`131`	`{`
`132`	`132`	`struct timespec64 t;`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -1212,8 +1212,8 @@ static int common_nsleep(const clockid_t which_clock, int flags,`
`1212`	`1212`	`}`
`1213`	`1213`
`1214`	`1214`	`SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,`
`1215`		`- const struct timespec __user *, rqtp,`
`1216`		`- struct timespec __user *, rmtp)`
	`1215`	`+ const struct __kernel_timespec __user *, rqtp,`
	`1216`	`+ struct __kernel_timespec __user *, rmtp)`
`1217`	`1217`	`{`
`1218`	`1218`	`const struct k_clock *kc = clockid_to_kclock(which_clock);`
`1219`	`1219`	`struct timespec64 t;`