aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-01-22 12:26:41 +0100
committerThomas Gleixner <tglx@linutronix.de>2015-01-22 12:28:02 +0100
commit5fbaba8603d5bbc9e40bcb970bae64cb7e093755 (patch)
treebcffaa86c7be757ab4c34283d9b6ec8643101dd9
parentf2a5473861cf69c03d0f0ee5d0ea1b853b9e582e (diff)
parent5e5aeb4367b450a28f447f6d5ab57d8f2ab16a5f (diff)
downloadlinux-5fbaba8603d5bbc9e40bcb970bae64cb7e093755.tar.gz
Merge branch 'fortglx/3.19-stable/time' of https://git.linaro.org/people/john.stultz/linux into timers/urgent
Pull urgent fixes from John Stultz: Two urgent fixes for user triggerable time related overflow issues
-rw-r--r--include/linux/time.h13
-rw-r--r--kernel/time/ntp.c7
-rw-r--r--kernel/time/time.c4
3 files changed, 24 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h
index 203c2ad40d7..beebe3a02d4 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -110,6 +110,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 struct timespec timespec_trunc(struct timespec t, unsigned gran);
#define CURRENT_TIME (current_kernel_time())
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 87a346fd6d6..28bf91c60a0 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -633,6 +633,13 @@ int ntp_validate_timex(struct timex *txc)
if ((txc->modes & ADJ_SETOFFSET) && (!capable(CAP_SYS_TIME)))
return -EPERM;
+ if (txc->modes & ADJ_FREQUENCY) {
+ if (LONG_MIN / PPM_SCALE > txc->freq)
+ return -EINVAL;
+ if (LONG_MAX / PPM_SCALE < txc->freq)
+ return -EINVAL;
+ }
+
return 0;
}
diff --git a/kernel/time/time.c b/kernel/time/time.c
index 65015ff2f07..887e7d50597 100644
--- 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;
}