Commit 7f4b5468 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds

[PATCH] {get,put}_compat_timspec: s390x

Here is the s390x part of the compat_timespec changes.
parent 9766c964
...@@ -1671,8 +1671,7 @@ asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid, ...@@ -1671,8 +1671,7 @@ asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid,
set_fs (KERNEL_DS); set_fs (KERNEL_DS);
ret = sys_sched_rr_get_interval(pid, &t); ret = sys_sched_rr_get_interval(pid, &t);
set_fs (old_fs); set_fs (old_fs);
if (put_user (t.tv_sec, &interval->tv_sec) || if (put_compat_timespec(&t, interval))
__put_user (t.tv_nsec, &interval->tv_nsec))
return -EFAULT; return -EFAULT;
return ret; return ret;
} }
...@@ -1806,8 +1805,7 @@ sys32_rt_sigtimedwait(sigset_t32 *uthese, siginfo_t32 *uinfo, ...@@ -1806,8 +1805,7 @@ sys32_rt_sigtimedwait(sigset_t32 *uthese, siginfo_t32 *uinfo,
signotset(&these); signotset(&these);
if (uts) { if (uts) {
if (get_user (ts.tv_sec, &uts->tv_sec) || if (get_compat_timespec(&ts, uts))
get_user (ts.tv_nsec, &uts->tv_nsec))
return -EINVAL; return -EINVAL;
if (ts.tv_nsec >= 1000000000L || ts.tv_nsec < 0 if (ts.tv_nsec >= 1000000000L || ts.tv_nsec < 0
|| ts.tv_sec < 0) || ts.tv_sec < 0)
...@@ -4149,13 +4147,12 @@ sys32_futex(void *uaddr, int op, int val, ...@@ -4149,13 +4147,12 @@ sys32_futex(void *uaddr, int op, int val,
mm_segment_t old_fs; mm_segment_t old_fs;
int ret; int ret;
if (get_user (tmp.tv_sec, &timeout32->tv_sec) || if (timeout32 && get_compat_timespec(&tmp, timeout32))
get_user (tmp.tv_nsec, &timeout32->tv_nsec))
return -EINVAL; return -EINVAL;
old_fs = get_fs(); old_fs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
ret = sys_futex(uaddr, op, val, &tmp); ret = sys_futex(uaddr, op, val, timeout32 ? &tmp : NULL);
set_fs(old_fs); set_fs(old_fs);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment