lkml.org 
[lkml]   [2018]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 71/83] rtc: hctosys: Add missing range error reporting
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Maciej W. Rozycki <macro@linux-mips.org>

    commit 7ce9a992ffde8ce93d5ae5767362a5c7389ae895 upstream.

    Fix an issue with the 32-bit range error path in `rtc_hctosys' where no
    error code is set and consequently the successful preceding call result
    from `rtc_read_time' is propagated to `rtc_hctosys_ret'. This in turn
    makes any subsequent call to `hctosys_show' incorrectly report in sysfs
    that the system time has been set from this RTC while it has not.

    Set the error to ERANGE then if we can't express the result due to an
    overflow.

    Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
    Fixes: b3a5ac42ab18 ("rtc: hctosys: Ensure system time doesn't overflow time_t")
    Cc: stable@vger.kernel.org # 4.17+
    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/rtc/hctosys.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/rtc/hctosys.c
    +++ b/drivers/rtc/hctosys.c
    @@ -50,8 +50,10 @@ static int __init rtc_hctosys(void)
    tv64.tv_sec = rtc_tm_to_time64(&tm);

    #if BITS_PER_LONG == 32
    - if (tv64.tv_sec > INT_MAX)
    + if (tv64.tv_sec > INT_MAX) {
    + err = -ERANGE;
    goto err_read;
    + }
    #endif

    err = do_settimeofday64(&tv64);

    \
     
     \ /
      Last update: 2018-11-19 18:26    [W:4.064 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site