projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fortglx/3.19-stable/time' of https://git.linaro.org/people/john.stultz...
[linux-2.6-block.git]
/
kernel
/
time
/
time.c
diff --git
a/kernel/time/time.c
b/kernel/time/time.c
index 65015ff2f07c6a6ba6144bc79e6fb85883bdceb2..887e7d505974c9c2475afa0447af1a062f7c9f94 100644
(file)
--- a/
kernel/time/time.c
+++ b/
kernel/time/time.c
@@
-196,6
+196,10
@@
SYSCALL_DEFINE2(settimeofday, struct timeval __user *, tv,
if (tv) {
if (copy_from_user(&user_tv, tv, sizeof(*tv)))
return -EFAULT;
+
+ if (!timeval_valid(&user_tv))
+ return -EINVAL;
+
new_ts.tv_sec = user_tv.tv_sec;
new_ts.tv_nsec = user_tv.tv_usec * NSEC_PER_USEC;
}