UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

y2038: futex: Add support for __kernel_timespec 

This prepares sys_futex for y2038 safe calling: the native
syscall is changed to receive a __kernel_timespec argument, which
will be switched to 64-bit time_t in the future. All the internal
time handling gets changed to timespec64, and the compat_sys_futex
entry point is moved under the CONFIG_COMPAT_32BIT_TIME check
to provide compatibility for existing 32-bit architectures.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2018-04-17 17:23:35 +02:00
parent 04e7712f44
commit bec2f7cbb7
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/syscalls.h
View File

@ -553,7 +553,7 @@ asmlinkage long sys_unshare(unsigned long unshare_flags);
/* kernel/futex.c */ /* kernel/futex.c */
asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val, asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val,
struct timespec __user *utime, u32 __user *uaddr2, struct __kernel_timespec __user *utime, u32 __user *uaddr2,
u32 val3); u32 val3);
asmlinkage long sys_get_robust_list(int pid, asmlinkage long sys_get_robust_list(int pid,
struct robust_list_head __user * __user *head_ptr, struct robust_list_head __user * __user *head_ptr,

22
kernel/futex.c
View File

@ -3558,10 +3558,10 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,
SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
struct timespec __user *, utime, u32 __user *, uaddr2, struct __kernel_timespec __user *, utime, u32 __user *, uaddr2,
u32, val3) u32, val3)
{ {
struct timespec ts; struct timespec64 ts;
ktime_t t, *tp = NULL; ktime_t t, *tp = NULL;
u32 val2 = 0; u32 val2 = 0;
int cmd = op & FUTEX_CMD_MASK; int cmd = op & FUTEX_CMD_MASK;
@ -3571,12 +3571,12 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
cmd == FUTEX_WAIT_REQUEUE_PI)) { cmd == FUTEX_WAIT_REQUEUE_PI)) {
if (unlikely(should_fail_futex(!(op & FUTEX_PRIVATE_FLAG)))) if (unlikely(should_fail_futex(!(op & FUTEX_PRIVATE_FLAG))))
return -EFAULT; return -EFAULT;
if (copy_from_user(&ts, utime, sizeof(ts)) != 0) if (get_timespec64(&ts, utime))
return -EFAULT; return -EFAULT;
if (!timespec_valid(&ts)) if (!timespec64_valid(&ts))
return -EINVAL; return -EINVAL;
t = timespec_to_ktime(ts); t = timespec64_to_ktime(ts);
if (cmd == FUTEX_WAIT) if (cmd == FUTEX_WAIT)
t = ktime_add_safe(ktime_get(), t); t = ktime_add_safe(ktime_get(), t);
tp = &t; tp = &t;
@ -3747,12 +3747,14 @@ err_unlock:
return ret; return ret;
} }
#endif /* CONFIG_COMPAT */
#ifdef CONFIG_COMPAT_32BIT_TIME
COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
struct old_timespec32 __user *, utime, u32 __user *, uaddr2, struct old_timespec32 __user *, utime, u32 __user *, uaddr2,
u32, val3) u32, val3)
{ {
struct timespec ts; struct timespec64 ts;
ktime_t t, *tp = NULL; ktime_t t, *tp = NULL;
int val2 = 0; int val2 = 0;
int cmd = op & FUTEX_CMD_MASK; int cmd = op & FUTEX_CMD_MASK;
@ -3760,12 +3762,12 @@ COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI || if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI ||
cmd == FUTEX_WAIT_BITSET || cmd == FUTEX_WAIT_BITSET ||
cmd == FUTEX_WAIT_REQUEUE_PI)) { cmd == FUTEX_WAIT_REQUEUE_PI)) {
if (compat_get_timespec(&ts, utime)) if (get_old_timespec32(&ts, utime))
return -EFAULT; return -EFAULT;
if (!timespec_valid(&ts)) if (!timespec64_valid(&ts))
return -EINVAL; return -EINVAL;
t = timespec_to_ktime(ts); t = timespec64_to_ktime(ts);
if (cmd == FUTEX_WAIT) if (cmd == FUTEX_WAIT)
t = ktime_add_safe(ktime_get(), t); t = ktime_add_safe(ktime_get(), t);
tp = &t; tp = &t;
@ -3776,7 +3778,7 @@ COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
return do_futex(uaddr, op, val, tp, uaddr2, val2, val3); return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);
} }
#endif /* CONFIG_COMPAT */ #endif /* CONFIG_COMPAT_32BIT_TIME */
static void __init futex_detect_cmpxchg(void) static void __init futex_detect_cmpxchg(void)
{ {