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

Commit 3f39894d authored by George Anzinger's avatar George Anzinger Committed by Linus Torvalds
Browse files

[PATCH] timespec: normalize off by one errors 



It would appear that the timespec normalize code has an off by one error.
Found in three places.  Thanks to Ben for spotting.

Signed-off-by: default avatarGeorge <Anzinger&lt;george@mvista.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 09e12f9f

include/linux/time.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ extern struct timespec timespec_trunc(struct timespec t, unsigned gran); 
static inline void

set_normalized_timespec (struct timespec *ts, time_t sec, long nsec)

{

	while (nsec > NSEC_PER_SEC) {

	while (nsec >= NSEC_PER_SEC) {

		nsec -= NSEC_PER_SEC;

		++sec;

	}

kernel/posix-timers.c

+3 −7
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static void tstojiffie(struct timespec *tp, int res, u64 *jiff) 
	long sec = tp->tv_sec;

	long nsec = tp->tv_nsec + res - 1;



	if (nsec > NSEC_PER_SEC) {

	if (nsec >= NSEC_PER_SEC) {

		sec++;

		nsec -= NSEC_PER_SEC;

	}
@@ -1209,13 +1209,9 @@ static int do_posix_clock_monotonic_get(clockid_t clock, struct timespec *tp) 


	do_posix_clock_monotonic_gettime_parts(tp, &wall_to_mono);



	tp->tv_sec += wall_to_mono.tv_sec;

	tp->tv_nsec += wall_to_mono.tv_nsec;

	set_normalized_timespec(tp, tp->tv_sec + wall_to_mono.tv_sec,

				tp->tv_nsec + wall_to_mono.tv_nsec);



	if ((tp->tv_nsec - NSEC_PER_SEC) > 0) {

		tp->tv_nsec -= NSEC_PER_SEC;

		tp->tv_sec++;

	}

	return 0;

}