diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2014-12-03 19:22:48 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-02-20 00:49:34 +0000 |
| commit | 1751fde0bb621f9d05dc76c7a0045b70b88918c2 (patch) | |
| tree | 75a72707a206e6c691cd2ce4652f019ea24d1432 /include/linux | |
| parent | ee368a2c5ed1806a6cbdcddadac86cbb3816d2f5 (diff) | |
| download | lwn-1751fde0bb621f9d05dc76c7a0045b70b88918c2.tar.gz lwn-1751fde0bb621f9d05dc76c7a0045b70b88918c2.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>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/time.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 8c0216e7d302..a87b4403600f 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -138,6 +138,19 @@ static inline bool timespec_valid_strict(const struct timespec *ts) return true; } +static inline bool timeval_valid(const struct timeval *tv) +{ + /* Dates before 1970 are bogus */ + if (tv->tv_sec < 0) + return false; + + /* Can't have more microseconds then a second */ + if (tv->tv_usec < 0 || tv->tv_usec >= USEC_PER_SEC) + return false; + + return true; +} + extern void read_persistent_clock(struct timespec *ts); extern void read_boot_clock(struct timespec *ts); extern int update_persistent_clock(struct timespec now); |