Commit f3c233d7 authored Feb 21, 2015 by Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull ntp fix from Ingo Molnar:
 "An adjtimex interface regression fix for 32-bit systems"

[ A check that was added in a previous commit is really only a concern
  for 64bit systems, but was applied to both 32 and 64bit systems, which
  results in breaking 32bit systems.

  Thus the fix here is to make the check only apply to 64bit systems ]

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ntp: Fixup adjtimex freq validation on 32-bit systems

parents 10436cf8 29183a70

kernel/time/ntp.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -633,10 +633,14 @@ 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)
		/*
		* Check for potential multiplication overflows that can
		* only happen on 64-bit systems:
		*/
		if ((txc->modes & ADJ_FREQUENCY) && (BITS_PER_LONG == 64)) {
		if (LLONG_MIN / PPM_SCALE > txc->freq)
		return -EINVAL;
		if (LONG_MAX / PPM_SCALE < txc->freq)
		if (LLONG_MAX / PPM_SCALE < txc->freq)
		return -EINVAL;
		}

Admin message