diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 11:05:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 11:05:22 -0800 |
| commit | f3c233d75ed0dd04e9eaf7cb43d79756fef1ef3a (patch) | |
| tree | 940fa2fb846a0d6e9bbc3232ebb8295c958d89a7 /kernel/time | |
| parent | 10436cf8812edadcc1813dbda39a69e9965caee6 (diff) | |
| parent | 29183a70b0b828500816bd794b3fe192fce89f73 (diff) | |
| download | op-kernel-dev-f3c233d75ed0dd04e9eaf7cb43d79756fef1ef3a.zip op-kernel-dev-f3c233d75ed0dd04e9eaf7cb43d79756fef1ef3a.tar.gz | |
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
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/ntp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 4b585e0..0f60b08 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -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; } |
