lkml.org 
[lkml]   [2019]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 39/48] ntp/y2038: Remove incorrect time_t truncation
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/kernel/time/ntp.c
    +++ b/kernel/time/ntp.c
    @@ -771,7 +771,7 @@ int __do_adjtimex(struct __kernel_timex
    /* 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;

    \
     
     \ /
      Last update: 2019-11-19 06:23    [W:4.133 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site