kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fortglx/3.19-stable/time' of https://git.linaro.org/people/john.stultz/linux into timers/urgent

Browse source 
Pull urgent fixes from John Stultz:

  Two urgent fixes for user triggerable time related overflow issues
This commit is contained in:
Thomas Gleixner 2015-01-22 12:26:41 +01:00
commit 5fbaba8603
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/linux/time.h
View file

@ -110,6 +110,19 @@ static inline bool timespec_valid_strict(const struct timespec *ts)
return true; 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); extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
#define CURRENT_TIME (current_kernel_time()) #define CURRENT_TIME (current_kernel_time())

7
kernel/time/ntp.c
View file

@ -633,6 +633,13 @@ int ntp_validate_timex(struct timex *txc)
if ((txc->modes & ADJ_SETOFFSET) && (!capable(CAP_SYS_TIME))) if ((txc->modes & ADJ_SETOFFSET) && (!capable(CAP_SYS_TIME)))
return -EPERM; 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; return 0;
} }

4
kernel/time/time.c
View file

@ -196,6 +196,10 @@ SYSCALL_DEFINE2(settimeofday, struct timeval __user *, tv,
if (tv) { if (tv) {
if (copy_from_user(&user_tv, tv, sizeof(*tv))) if (copy_from_user(&user_tv, tv, sizeof(*tv)))
return -EFAULT; return -EFAULT;
if (!timeval_valid(&user_tv))
return -EINVAL;
new_ts.tv_sec = user_tv.tv_sec; new_ts.tv_sec = user_tv.tv_sec;
new_ts.tv_nsec = user_tv.tv_usec * NSEC_PER_USEC; new_ts.tv_nsec = user_tv.tv_usec * NSEC_PER_USEC;
} }