diff options
| author | Sasha Levin <levinsasha928@gmail.com> | 2012-03-15 12:36:14 -0400 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:37:34 +0200 |
| commit | 58c37cca51fc5976dbaa7e62c18da072e7a8e622 (patch) | |
| tree | e87a12033df2d57fff51f7d78e6cd14db2f2554a /kernel | |
| parent | f12847e2fa97bd4c33379d02492e99b47687db7f (diff) | |
ntp: Fix integer overflow when setting time
commit a078c6d0e6288fad6d83fb6d5edd91ddb7b6ab33 upstream.
'long secs' is passed as divisor to div_s64, which accepts a 32bit
divisor. On 64bit machines that value is trimmed back from 8 bytes
back to 4, causing a divide by zero when the number is bigger than
(1 << 32) - 1 and all 32 lower bits are 0.
Use div64_long() instead.
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Cc: johnstul@us.ibm.com
Link: http://lkml.kernel.org/r/1331829374-31543-2-git-send-email-levinsasha928@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[WT: div64_long() does not exist on 2.6.32 and needs a deeper backport than
desired. Instead, address the issue by controlling that the divisor is
correct for use as an s32 divisor]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/ntp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index c1c36a2c94cb..26472a769c4c 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -106,7 +106,7 @@ static inline s64 ntp_update_offset_fll(s64 offset64, long secs) { time_status &= ~STA_MODE; - if (secs < MINSEC) + if ((s32)secs < MINSEC) return 0; if (!(time_status & STA_FLL) && (secs <= MAXSEC)) |