posix-timers: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME

deepa-hub · arndb · commit b5793b0d92c9 · 2018-04-19T13:30:58.000+02:00
clock_gettime, clock_settime, clock_getres and clock_nanosleep
compat syscalls are also repurposed to provide backward compatibility
to support 32 bit time_t on 32 bit systems.

Note that nanosleep compat syscall will also be treated the same way
as the above syscalls as it shares common handler functions with
clock_nanosleep. But, there is no plan to provide y2038 safe solution
for nanosleep.

Signed-off-by: Deepa Dinamani &lt;deepa.kernel@gmail.com&gt;
Signed-off-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
@@ -1763,7 +1763,7 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
 	return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
 }
 
-#ifdef CONFIG_COMPAT
+#ifdef CONFIG_COMPAT_32BIT_TIME
 
 COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
 		       struct compat_timespec __user *, rmtp)
diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
@@ -160,7 +160,9 @@ COMPAT_SYS_NI(timer_settime);
 COMPAT_SYS_NI(timer_gettime);
 COMPAT_SYS_NI(getitimer);
 COMPAT_SYS_NI(setitimer);
+#endif
 
+#ifdef CONFIG_COMPAT_32BIT_TIME
 COMPAT_SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
 		       struct compat_timespec __user *, tp)
 {
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
@@ -1114,7 +1114,7 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,
 	return error;
 }
 
-#ifdef CONFIG_COMPAT
+#ifdef CONFIG_COMPAT_32BIT_TIME
 
 COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
 		       struct compat_timespec __user *, tp)
@@ -1149,6 +1149,10 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
 	return err;
 }
 
+#endif
+
+#ifdef CONFIG_COMPAT
+
 COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
 		       struct compat_timex __user *, utp)
 {
@@ -1173,6 +1177,10 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
 	return err;
 }
 
+#endif
+
+#ifdef CONFIG_COMPAT_32BIT_TIME
+
 COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
 		       struct compat_timespec __user *, tp)
 {
@@ -1228,7 +1236,8 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
 	return kc->nsleep(which_clock, flags, &t);
 }
 
-#ifdef CONFIG_COMPAT
+#ifdef CONFIG_COMPAT_32BIT_TIME
+
 COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
 		       struct compat_timespec __user *, rqtp,
 		       struct compat_timespec __user *, rmtp)
@@ -1253,6 +1262,7 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
 
 	return kc->nsleep(which_clock, flags, &t);
 }
+
 #endif
 
 static const struct k_clock clock_realtime = {

Original file line number	Diff line number	Diff line change
`@@ -1763,7 +1763,7 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,`
`1763`	`1763`	`return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC);`
`1764`	`1764`	`}`
`1765`	`1765`
`1766`		`-#ifdef CONFIG_COMPAT`
	`1766`	`+#ifdef CONFIG_COMPAT_32BIT_TIME`
`1767`	`1767`
`1768`	`1768`	`COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,`
`1769`	`1769`	`struct compat_timespec __user *, rmtp)`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,9 @@ COMPAT_SYS_NI(timer_settime);`
`160`	`160`	`COMPAT_SYS_NI(timer_gettime);`
`161`	`161`	`COMPAT_SYS_NI(getitimer);`
`162`	`162`	`COMPAT_SYS_NI(setitimer);`
	`163`	`+#endif`
`163`	`164`
	`165`	`+#ifdef CONFIG_COMPAT_32BIT_TIME`
`164`	`166`	`COMPAT_SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,`
`165`	`167`	`struct compat_timespec __user *, tp)`
`166`	`168`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,7 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,`
`1114`	`1114`	`return error;`
`1115`	`1115`	`}`
`1116`	`1116`
`1117`		`-#ifdef CONFIG_COMPAT`
	`1117`	`+#ifdef CONFIG_COMPAT_32BIT_TIME`
`1118`	`1118`
`1119`	`1119`	`COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,`
`1120`	`1120`	`struct compat_timespec __user *, tp)`
`@@ -1149,6 +1149,10 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,`
`1149`	`1149`	`return err;`
`1150`	`1150`	`}`
`1151`	`1151`
	`1152`	`+#endif`
	`1153`	`+`
	`1154`	`+#ifdef CONFIG_COMPAT`
	`1155`	`+`
`1152`	`1156`	`COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,`
`1153`	`1157`	`struct compat_timex __user *, utp)`
`1154`	`1158`	`{`
`@@ -1173,6 +1177,10 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,`
`1173`	`1177`	`return err;`
`1174`	`1178`	`}`
`1175`	`1179`
	`1180`	`+#endif`
	`1181`	`+`
	`1182`	`+#ifdef CONFIG_COMPAT_32BIT_TIME`
	`1183`	`+`
`1176`	`1184`	`COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,`
`1177`	`1185`	`struct compat_timespec __user *, tp)`
`1178`	`1186`	`{`
`@@ -1228,7 +1236,8 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,`
`1228`	`1236`	`return kc->nsleep(which_clock, flags, &t);`
`1229`	`1237`	`}`
`1230`	`1238`
`1231`		`-#ifdef CONFIG_COMPAT`
	`1239`	`+#ifdef CONFIG_COMPAT_32BIT_TIME`
	`1240`	`+`
`1232`	`1241`	`COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,`
`1233`	`1242`	`struct compat_timespec __user *, rqtp,`
`1234`	`1243`	`struct compat_timespec __user *, rmtp)`
`@@ -1253,6 +1262,7 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,`
`1253`	`1262`
`1254`	`1263`	`return kc->nsleep(which_clock, flags, &t);`
`1255`	`1264`	`}`
	`1265`	`+`
`1256`	`1266`	`#endif`
`1257`	`1267`
`1258`	`1268`	`static const struct k_clock clock_realtime = {`