Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fbaba86 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'fortglx/3.19-stable/time' of... 

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
parents f2a54738 5e5aeb43

include/linux/time.h

+13 −0
Original line number Diff line number Diff line
@@ -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())

kernel/time/ntp.c

+7 −0
Original line number Diff line number Diff line
@@ -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;

}

kernel/time/time.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

	}