diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2011-02-18 10:07:25 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-18 17:01:12 +0100 |
| commit | db1c1cce4a653dcbe6949c72ae7b9f42cab1b929 (patch) | |
| tree | c90203be70d8fbe19e462e45f0573e34208a8927 /kernel/time | |
| parent | 22b7fcdae562b6792b3f5517e89fd7e0337180ae (diff) | |
| download | linux-stable-db1c1cce4a653dcbe6949c72ae7b9f42cab1b929.tar.gz linux-stable-db1c1cce4a653dcbe6949c72ae7b9f42cab1b929.tar.bz2 linux-stable-db1c1cce4a653dcbe6949c72ae7b9f42cab1b929.zip | |
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>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | 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 5ac593267a26..5f1bb8e2008f 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); |