faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix fault where chronyd enters an endless loop on x86_64

Browse source 
John writes:
Here is a patch that should prevent the endless loop.  I've changed
UTI_NormaliseTimeval() to use divide/remainder instead of a loop.  It also
replaces some similar loops with calls to UTI_NormaliseTimeval() and fixes
an unrelated bug in UTI_DiffTimevals().
This commit is contained in:
John Hasler 2008-04-29 12:40:15 -05:00 committed by Richard P. Curnow
parent 71aa36aa6e
commit bc0aaa9217
1 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
util.c
View file

@ -87,15 +87,17 @@ UTI_CompareTimevals(struct timeval *a, struct timeval *b)
INLINE_STATIC void INLINE_STATIC void
UTI_NormaliseTimeval(struct timeval *x) UTI_NormaliseTimeval(struct timeval *x)
{ {
while (x->tv_usec >= 1000000) { /* Reduce tv_usec to within +-1000000 of zero. JGH */
++x->tv_sec; if ((x->tv_usec >= 1000000) || (x->tv_usec <= -1000000)) {
x->tv_usec -= 1000000; x->tv_sec += x->tv_usec/1000000;
x->tv_usec = x->tv_usec%1000000;
} }
while (x->tv_usec < 0) { /* Make tv_usec positive. JGH */
if (x->tv_usec < 0) {
--x->tv_sec; --x->tv_sec;
x->tv_usec += 1000000; x->tv_usec += 1000000;
} }
} }
@ -110,17 +112,9 @@ UTI_DiffTimevals(struct timeval *result,
result->tv_usec = a->tv_usec - b->tv_usec; result->tv_usec = a->tv_usec - b->tv_usec;
/* Correct microseconds field to bring it into the range /* Correct microseconds field to bring it into the range
[0,1000000) */ (0,1000000) */
while (result->tv_usec < 0) { UTI_NormaliseTimeval(result); /* JGH */
result->tv_usec += 1000000;
--result->tv_sec;
}
while (result->tv_usec > 999999) {
result->tv_usec -= 1000000;
++result->tv_sec;
}
return; return;
} }
@ -191,7 +185,7 @@ UTI_AverageDiffTimevals (struct timeval *earlier,
} }
tvhalf.tv_sec = tvdiff.tv_sec / 2; tvhalf.tv_sec = tvdiff.tv_sec / 2;
tvhalf.tv_usec = tvdiff.tv_usec / 2 + (tvdiff.tv_sec % 2); tvhalf.tv_usec = tvdiff.tv_usec / 2 + (tvdiff.tv_sec % 2) * 500000; /* JGH */
average->tv_sec = earlier->tv_sec + tvhalf.tv_sec; average->tv_sec = earlier->tv_sec + tvhalf.tv_sec;
average->tv_usec = earlier->tv_usec + tvhalf.tv_usec; average->tv_usec = earlier->tv_usec + tvhalf.tv_usec;
@ -199,17 +193,7 @@ UTI_AverageDiffTimevals (struct timeval *earlier,
/* Bring into range */ /* Bring into range */
UTI_NormaliseTimeval(average); UTI_NormaliseTimeval(average);
while (average->tv_usec >= 1000000) { }
++average->tv_sec;
average->tv_usec -= 1000000;
}
while (average->tv_usec < 0) {
--average->tv_sec;
average->tv_usec += 1000000;
}
}
/* ================================================== */ /* ================================================== */