diff options
| author | Sasha Levin <levinsasha928@gmail.com> | 2012-03-15 12:36:14 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 10:31:52 -0700 |
| commit | b2af31bf80a9c38d9ade24e44aa269807b4f592c (patch) | |
| tree | 5d5efa26bdfd2ca1b7890438784035e4b9aeb748 /kernel | |
| parent | bd7a318433d1b69aa81392df40c10958a587f82d (diff) | |
| download | lwn-b2af31bf80a9c38d9ade24e44aa269807b4f592c.tar.gz lwn-b2af31bf80a9c38d9ade24e44aa269807b4f592c.zip | |
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>
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 f6117a4c7cb8..4b85a7a72526 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -275,7 +275,7 @@ static inline s64 ntp_update_offset_fll(s64 offset64, long secs) time_status |= STA_MODE; - return div_s64(offset64 << (NTP_SCALE_SHIFT - SHIFT_FLL), secs); + return div64_long(offset64 << (NTP_SCALE_SHIFT - SHIFT_FLL), secs); } static void ntp_update_offset(long offset) |