diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-01-22 12:26:41 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-01-22 12:28:02 +0100 |
| commit | 5fbaba8603d5bbc9e40bcb970bae64cb7e093755 (patch) | |
| tree | bcffaa86c7be757ab4c34283d9b6ec8643101dd9 /kernel/time | |
| parent | f2a5473861cf69c03d0f0ee5d0ea1b853b9e582e (diff) | |
| parent | 5e5aeb4367b450a28f447f6d5ab57d8f2ab16a5f (diff) | |
| download | op-kernel-dev-5fbaba8603d5bbc9e40bcb970bae64cb7e093755.zip op-kernel-dev-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
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/ntp.c | 7 | ||||
| -rw-r--r-- | kernel/time/time.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 87a346f..28bf91c 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 65015ff..887e7d5 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; } |
