projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gcov' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
time.c
diff --git
a/kernel/time.c
b/kernel/time.c
index d21398e6da87f19d62e3b20fd1d7ded9ffa9cabf..31ec845d0e80f615ba01a1dfead04d4a6c0dc8fc 100644
(file)
--- a/
kernel/time.c
+++ b/
kernel/time.c
@@
-195,6
+195,10
@@
SYSCALL_DEFINE2(settimeofday, struct timeval __user *, tv,
if (tv) {
if (copy_from_user(&user_tv, tv, sizeof(*tv)))
return -EFAULT;
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;
}
new_ts.tv_sec = user_tv.tv_sec;
new_ts.tv_nsec = user_tv.tv_usec * NSEC_PER_USEC;
}