ntp: Fix integer overflow when setting time

'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 <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Cc: [email protected]
Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 17fb1b9807d040e8a17be546fc849852fcaac17f..6e039b144daf0359ecaffcbc00227a7233fd0dd3 100644 (file)
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -289,7 +289,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)