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

leapdb: fix leapsec list processing with 32-bit time_t

Browse source 
A 32-bit time_t value overflows when converted to the Y1900 epoch used
in the leapsec list. Use a 64-bit variable in get_list_leap() to fix the
comparisons on systems using 32-bit time_t.

Fixes: 53823b9f1c ("leapdb: support leap-seconds.list as second source")
This commit is contained in:
Miroslav Lichvar 2024-04-03 11:01:44 +02:00
parent 24d28cd679
commit b8ead3485b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
leapdb.c
View file

@ -110,7 +110,7 @@ get_list_leap(time_t when, int *tai_offset)
char line[1024]; char line[1024];
NTP_Leap ret_leap = LEAP_Normal; NTP_Leap ret_leap = LEAP_Normal;
int ret_tai_offset = 0, prev_lsl_tai_offset = 10; int ret_tai_offset = 0, prev_lsl_tai_offset = 10;
int64_t lsl_updated = 0, lsl_expiry = 0; int64_t when1900, lsl_updated = 0, lsl_expiry = 0;
const char *leap_sec_list = CNF_GetLeapSecList(); const char *leap_sec_list = CNF_GetLeapSecList();
if (!(f = UTI_OpenFile(NULL, leap_sec_list, NULL, 'r', 0))) { if (!(f = UTI_OpenFile(NULL, leap_sec_list, NULL, 'r', 0))) {
@ -122,7 +122,7 @@ get_list_leap(time_t when, int *tai_offset)
when = (when / (24 * 3600) + 1) * (24 * 3600); when = (when / (24 * 3600) + 1) * (24 * 3600);
/* leap-seconds.list timestamps are relative to 1 Jan 1900, 00:00:00 */ /* leap-seconds.list timestamps are relative to 1 Jan 1900, 00:00:00 */
when += LEAP_SEC_LIST_OFFSET; when1900 = when + LEAP_SEC_LIST_OFFSET;
while (fgets(line, sizeof line, f) > 0) { while (fgets(line, sizeof line, f) > 0) {
int64_t lsl_when; int64_t lsl_when;
@ -150,14 +150,14 @@ get_list_leap(time_t when, int *tai_offset)
if (sscanf(line, "%"SCNd64" %d", &lsl_when, &lsl_tai_offset) != 2) if (sscanf(line, "%"SCNd64" %d", &lsl_when, &lsl_tai_offset) != 2)
goto error; goto error;
if (when == lsl_when) { if (when1900 == lsl_when) {
if (lsl_tai_offset > prev_lsl_tai_offset) if (lsl_tai_offset > prev_lsl_tai_offset)
ret_leap = LEAP_InsertSecond; ret_leap = LEAP_InsertSecond;
else if (lsl_tai_offset < prev_lsl_tai_offset) else if (lsl_tai_offset < prev_lsl_tai_offset)
ret_leap = LEAP_DeleteSecond; ret_leap = LEAP_DeleteSecond;
/* When is rounded to the end of the day, so offset hasn't changed yet! */ /* When is rounded to the end of the day, so offset hasn't changed yet! */
ret_tai_offset = prev_lsl_tai_offset; ret_tai_offset = prev_lsl_tai_offset;
} else if (when > lsl_when) { } else if (when1900 > lsl_when) {
ret_tai_offset = lsl_tai_offset; ret_tai_offset = lsl_tai_offset;
} }
@ -168,7 +168,7 @@ get_list_leap(time_t when, int *tai_offset)
if (!feof(f) || !lsl_updated || !lsl_expiry) if (!feof(f) || !lsl_updated || !lsl_expiry)
goto error; goto error;
if (when >= lsl_expiry) if (when1900 >= lsl_expiry)
LOG(LOGS_WARN, "Leap second list %s needs update", leap_sec_list); LOG(LOGS_WARN, "Leap second list %s needs update", leap_sec_list);
goto out; goto out;