| From a49c9c99def5f4c458acac16bb8e0d96948f9def Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Fri, 8 Nov 2019 21:34:24 +0100 |
| Subject: [PATCH] ntp/y2038: Remove incorrect time_t truncation |
| |
| commit 2f5841349df281ecf8f81cc82d869b8476f0db0b upstream. |
| |
| 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. |
| |
| Fixes: ead25417f82e ("timex: use __kernel_timex internally") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Cc: stable@vger.kernel.org |
| Link: https://lkml.kernel.org/r/20191108203435.112759-2-arnd@arndb.de |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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; |
| -- |
| 2.7.4 |
| |
