diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2014-12-03 19:22:48 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-29 17:40:49 -0800 |
commit | 5fea291eddb2b2721874c860783e0516df3ad699 (patch) | |
tree | cb0d7d2a7b1528d6d7349a7cf98404514627bb1f /kernel | |
parent | ba42a61e500b1619c4f29cd2b6ac693c0ecc9645 (diff) | |
download | lwn-5fea291eddb2b2721874c860783e0516df3ad699.tar.gz lwn-5fea291eddb2b2721874c860783e0516df3ad699.zip |
time: settimeofday: Validate the values of tv from user
commit 6ada1fc0e1c4775de0e043e1bd3ae9d065491aa5 upstream.
An unvalidated user input is multiplied by a constant, which can result in
an undefined behaviour for large values. While this is validated later,
we should avoid triggering undefined behaviour.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
[jstultz: include trivial milisecond->microsecond correction noticed
by Andy]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/time.c b/kernel/time.c index 3c49ab45f822..3eb322e518a3 100644 --- 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 (!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; } |