Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db1c1cce authored by Richard Cochran's avatar Richard Cochran Committed by Thomas Gleixner
Browse files

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: default avatarRichard Cochran <richard.cochran@omicron.at>
Cc: johnstul@us.ibm.com
LKML-Reference: <20110218090724.GA2924@riccoc20.at.omicron.at>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 22b7fcda

kernel/time/ntp.c

+3 −3
Original line number Diff line number Diff line
@@ -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);