time: Change types to new y2038 safe __kernel_* types

deepa-hub · arndb · commit 6d5b84132459 · 2018-04-19T13:31:49.000+02:00
Change over clock_settime, clock_gettime and clock_getres
syscalls to use __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.

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/syscalls.h b/include/linux/syscalls.h
@@ -567,11 +567,11 @@ asmlinkage long sys_timer_settime(timer_t timer_id, int flags,
 				struct itimerspec __user *old_setting);
 asmlinkage long sys_timer_delete(timer_t timer_id);
 asmlinkage long sys_clock_settime(clockid_t which_clock,
-				const struct timespec __user *tp);
+				const struct __kernel_timespec __user *tp);
 asmlinkage long sys_clock_gettime(clockid_t which_clock,
-				struct timespec __user *tp);
+				struct __kernel_timespec __user *tp);
 asmlinkage long sys_clock_getres(clockid_t which_clock,
-				struct timespec __user *tp);
+				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);
diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
@@ -59,7 +59,7 @@ SYS_NI(alarm);
  */
 
 SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
-		const struct timespec __user *, tp)
+		const struct __kernel_timespec __user *, tp)
 {
 	struct timespec64 new_tp;
 
@@ -92,7 +92,7 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp)
 	return 0;
 }
 SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
-		struct timespec __user *, tp)
+		struct __kernel_timespec __user *, tp)
 {
 	int ret;
 	struct timespec64 kernel_tp;
@@ -106,7 +106,7 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
 	return 0;
 }
 
-SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct timespec __user *, tp)
+SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct __kernel_timespec __user *, tp)
 {
 	struct timespec64 rtn_tp = {
 		.tv_sec = 0,
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
@@ -1041,7 +1041,7 @@ void exit_itimers(struct signal_struct *sig)
 }
 
 SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
-		const struct timespec __user *, tp)
+		const struct __kernel_timespec __user *, tp)
 {
 	const struct k_clock *kc = clockid_to_kclock(which_clock);
 	struct timespec64 new_tp;
@@ -1056,7 +1056,7 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
 }
 
 SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
-		struct timespec __user *,tp)
+		struct __kernel_timespec __user *, tp)
 {
 	const struct k_clock *kc = clockid_to_kclock(which_clock);
 	struct timespec64 kernel_tp;
@@ -1097,7 +1097,7 @@ SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
 }
 
 SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,
-		struct timespec __user *, tp)
+		struct __kernel_timespec __user *, tp)
 {
 	const struct k_clock *kc = clockid_to_kclock(which_clock);
 	struct timespec64 rtn_tp;

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ SYS_NI(alarm);`
`59`	`59`	`*/`
`60`	`60`
`61`	`61`	`SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,`
`62`		`- const struct timespec __user *, tp)`
	`62`	`+ const struct __kernel_timespec __user *, tp)`
`63`	`63`	`{`
`64`	`64`	`struct timespec64 new_tp;`
`65`	`65`
`@@ -92,7 +92,7 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp)`
`92`	`92`	`return 0;`
`93`	`93`	`}`
`94`	`94`	`SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,`
`95`		`- struct timespec __user *, tp)`
	`95`	`+ struct __kernel_timespec __user *, tp)`
`96`	`96`	`{`
`97`	`97`	`int ret;`
`98`	`98`	`struct timespec64 kernel_tp;`
`@@ -106,7 +106,7 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,`
`106`	`106`	`return 0;`
`107`	`107`	`}`
`108`	`108`
`109`		`-SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct timespec __user *, tp)`
	`109`	`+SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct __kernel_timespec __user *, tp)`
`110`	`110`	`{`
`111`	`111`	`struct timespec64 rtn_tp = {`
`112`	`112`	`.tv_sec = 0,`
Original file line number	Diff line number	Diff line change
`@@ -1041,7 +1041,7 @@ void exit_itimers(struct signal_struct *sig)`
`1041`	`1041`	`}`
`1042`	`1042`
`1043`	`1043`	`SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,`
`1044`		`- const struct timespec __user *, tp)`
	`1044`	`+ const struct __kernel_timespec __user *, tp)`
`1045`	`1045`	`{`
`1046`	`1046`	`const struct k_clock *kc = clockid_to_kclock(which_clock);`
`1047`	`1047`	`struct timespec64 new_tp;`
`@@ -1056,7 +1056,7 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`	`1058`	`SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,`
`1059`		`- struct timespec __user *,tp)`
	`1059`	`+ struct __kernel_timespec __user *, tp)`
`1060`	`1060`	`{`
`1061`	`1061`	`const struct k_clock *kc = clockid_to_kclock(which_clock);`
`1062`	`1062`	`struct timespec64 kernel_tp;`
`@@ -1097,7 +1097,7 @@ SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,`
`1097`	`1097`	`}`
`1098`	`1098`
`1099`	`1099`	`SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,`
`1100`		`- struct timespec __user *, tp)`
	`1100`	`+ struct __kernel_timespec __user *, tp)`
`1101`	`1101`	`{`
`1102`	`1102`	`const struct k_clock *kc = clockid_to_kclock(which_clock);`
`1103`	`1103`	`struct timespec64 rtn_tp;`