mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 14:27:48 +00:00
Koen Kooi
bb34e69f3d
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From c763173b9ab87b7413e63a82be88987250677b89 Mon Sep 17 00:00:00 2001
|
|
From: Sasha Levin <levinsasha928@gmail.com>
|
|
Date: Thu, 15 Mar 2012 12:36:14 -0400
|
|
Subject: [PATCH 042/147] 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>
|
|
---
|
|
kernel/time/ntp.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
|
|
index f6117a4..4b85a7a 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)
|
|
--
|
|
1.7.9.4
|
|
|