[1/8] y2038: timex: remove incorrect time_t truncation

Message ID 20191108203435.112759-2-arnd@arndb.de
State Accepted
Commit 2f5841349df281ecf8f81cc82d869b8476f0db0b
Headers show
Series
  • [1/8] y2038: timex: remove incorrect time_t truncation
Related show

Commit Message

Arnd Bergmann Nov. 8, 2019, 8:34 p.m.
A cast to 'time_t' was accidentally left in place during the
conversion of __do_adjtimex() to 64-bit timestamps, so the
resulting value is incorrectly truncated.

Remove the cast so the 64-bit time gets propagated correctly.

Cc: stable@vger.kernel.org
Fixes: ead25417f82e ("timex: use __kernel_timex internally")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 kernel/time/ntp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.0

Comments

Deepa Dinamani Nov. 10, 2019, 8:44 p.m. | #1
Thanks for fixing the bug.

Acked-by: Deepa Dinamani <deepa.kernel@gmail.com>

Patch

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 65eb796610dc..069ca78fb0bf 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -771,7 +771,7 @@  int __do_adjtimex(struct __kernel_timex *txc, const struct timespec64 *ts,
 	/* fill PPS status fields */
 	pps_fill_timex(txc);
 
-	txc->time.tv_sec = (time_t)ts->tv_sec;
+	txc->time.tv_sec = ts->tv_sec;
 	txc->time.tv_usec = ts->tv_nsec;
 	if (!(time_status & STA_NANO))
 		txc->time.tv_usec = ts->tv_nsec / NSEC_PER_USEC;