lkml.org 
[lkml]   [2011]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:timers/core] ntp: Remove redundant and incorrect parameter check
    Commit-ID:  db1c1cce4a653dcbe6949c72ae7b9f42cab1b929
    Gitweb: http://git.kernel.org/tip/db1c1cce4a653dcbe6949c72ae7b9f42cab1b929
    Author: Richard Cochran <richardcochran@gmail.com>
    AuthorDate: Fri, 18 Feb 2011 10:07:25 +0100
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Fri, 18 Feb 2011 17:01:12 +0100

    ntp: Remove redundant and incorrect parameter check

    The ADJ_SETOFFSET code redundantly checks the range of the nanoseconds
    field of the time value. This field is checked again in the subsequent
    call to timekeeping_inject_offset(). Also, as is, the check will not
    detect whether the number of microseconds is out of range.

    Let timekeeping_inject_offset() do the error checking.

    Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
    Cc: johnstul@us.ibm.com
    LKML-Reference: <20110218090724.GA2924@riccoc20.at.omicron.at>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

    ---
    kernel/time/ntp.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
    index 5ac5932..5f1bb8e 100644
    --- a/kernel/time/ntp.c
    +++ b/kernel/time/ntp.c
    @@ -650,13 +650,13 @@ int do_adjtimex(struct timex *txc)

    if (txc->modes & ADJ_SETOFFSET) {
    struct timespec delta;
    - if ((unsigned long)txc->time.tv_usec >= NSEC_PER_SEC)
    - return -EINVAL;
    delta.tv_sec = txc->time.tv_sec;
    delta.tv_nsec = txc->time.tv_usec;
    if (!(txc->modes & ADJ_NANO))
    delta.tv_nsec *= 1000;
    - timekeeping_inject_offset(&delta);
    + result = timekeeping_inject_offset(&delta);
    + if (result)
    + return result;
    }

    getnstimeofday(&ts);

    \
     
     \ /
      Last update: 2011-02-18 17:09    [W:4.146 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site