Skip to content

Commit

Permalink
Fixed wrongful time_t=long assumptions in hwclock.c and timeutils.c
Browse files Browse the repository at this point in the history
  • Loading branch information
@arbego
arbego committed Apr 29, 2021
1 parent 56702ef commit ce3355c
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 65 deletions.
9 changes: 5 additions & 4 deletions lib/timeutils.c
View file
Expand Up @@ -24,6 +24,7 @@
#include <string.h>
#include <time.h>
#include <sys/time.h>
#include <inttypes.h>

#include "c.h"
#include "nls.h"
Expand Down Expand Up @@ -438,14 +439,14 @@ static int format_iso_time(struct tm *tm, suseconds_t usec, int flags, char *buf
}

if (flags & ISO_DOTUSEC) {
len = snprintf(p, bufsz, ".%06ld", (long) usec);
len = snprintf(p, bufsz, ".%06"PRId64, (int64_t) usec);
if (len < 0 || (size_t) len > bufsz)
goto err;
bufsz -= len;
p += len;

} else if (flags & ISO_COMMAUSEC) {
len = snprintf(p, bufsz, ",%06ld", (long) usec);
len = snprintf(p, bufsz, ",%06"PRId64, (int64_t) usec);
if (len < 0 || (size_t) len > bufsz)
goto err;
bufsz -= len;
Expand Down Expand Up @@ -480,7 +481,7 @@ int strtimeval_iso(struct timeval *tv, int flags, char *buf, size_t bufsz)
if (rc)
return format_iso_time(&tm, tv->tv_usec, flags, buf, bufsz);

warnx(_("time %ld is out of range."), tv->tv_sec);
warnx(_("time %"PRId64" is out of range."), (int64_t)(tv->tv_sec));
return -1;
}

Expand All @@ -504,7 +505,7 @@ int strtime_iso(const time_t *t, int flags, char *buf, size_t bufsz)
if (rc)
return format_iso_time(&tm, 0, flags, buf, bufsz);

warnx(_("time %ld is out of range."), (long)t);
warnx(_("time %"PRId64" is out of range."), (int64_t)*t);
return -1;
}

Expand Down
116 changes: 55 additions & 61 deletions sys-utils/hwclock.c
View file
Expand Up @@ -74,6 +74,7 @@
#include <sys/syscall.h>
#include <time.h>
#include <unistd.h>
#include <inttypes.h>

#include "c.h"
#include "closestream.h"
Expand Down Expand Up @@ -227,6 +228,8 @@ static int read_adjtime(const struct hwclock_control *ctl,
char line1[81]; /* String: first line of adjtime file */
char line2[81]; /* String: second line of adjtime file */
char line3[81]; /* String: third line of adjtime file */
int64_t last_adj_time;
int64_t last_calib_time;

if (access(ctl->adj_file_name, R_OK) != 0)
return EXIT_SUCCESS;
Expand All @@ -246,21 +249,15 @@ static int read_adjtime(const struct hwclock_control *ctl,

fclose(adjfile);

if (sizeof(time_t) > 4) {
sscanf(line1, "%lf %lld %lf",
&adjtime_p->drift_factor,
(long long int*)&adjtime_p->last_adj_time,
&adjtime_p->not_adjusted);
sscanf(line1, "%lf %"SCNd64" %lf",
&adjtime_p->drift_factor,
&last_adj_time,
&adjtime_p->not_adjusted);

sscanf(line2, "%lld", (long long int*)&adjtime_p->last_calib_time);
} else {
sscanf(line1, "%lf %ld %lf",
&adjtime_p->drift_factor,
(long*)&adjtime_p->last_adj_time,
&adjtime_p->not_adjusted);
sscanf(line2, "%"SCNd64, &last_calib_time);

sscanf(line2, "%ld", (long*)&adjtime_p->last_calib_time);
}
adjtime_p->last_adj_time = (time_t)last_adj_time;
adjtime_p->last_calib_time = (time_t)last_calib_time;

if (!strcmp(line3, "UTC\n")) {
adjtime_p->local_utc = UTC;
Expand All @@ -275,11 +272,10 @@ static int read_adjtime(const struct hwclock_control *ctl,
}

if (ctl->verbose) {
printf(_
("Last drift adjustment done at %lld seconds after 1969\n"),
(long long int)adjtime_p->last_adj_time);
printf(_("Last calibration done at %lld seconds after 1969\n"),
(long long int)adjtime_p->last_calib_time);
printf(_("Last drift adjustment done at %"PRId64" seconds after 1969\n"),
(int64_t)adjtime_p->last_adj_time);
printf(_("Last calibration done at %"PRId64" seconds after 1969\n"),
(int64_t)adjtime_p->last_calib_time);
printf(_("Hardware clock is on %s time\n"),
(adjtime_p->local_utc ==
LOCAL) ? _("local") : (adjtime_p->local_utc ==
Expand Down Expand Up @@ -363,11 +359,10 @@ mktime_tz(const struct hwclock_control *ctl, struct tm tm,
} else {
valid = 1;
if (ctl->verbose)
printf(_
("Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = "
"%lld seconds since 1969\n"), tm.tm_year + 1900,
printf(_("Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = "
"%"PRId64" seconds since 1969\n"), tm.tm_year + 1900,
tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min,
tm.tm_sec, (long long int)*systime_p);
tm.tm_sec, (int64_t)*systime_p);
}
return valid;
}
Expand All @@ -390,8 +385,7 @@ read_hardware_clock(const struct hwclock_control *ctl,
return err;

if (ctl->verbose)
printf(_
("Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"),
printf(_("Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"),
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour,
tm.tm_min, tm.tm_sec);
*valid_p = mktime_tz(ctl, tm, systime_p);
Expand Down Expand Up @@ -419,9 +413,9 @@ set_hardware_clock(const struct hwclock_control *ctl, const time_t newtime)

if (ctl->verbose)
printf(_("Setting Hardware Clock to %.2d:%.2d:%.2d "
"= %lld seconds since 1969\n"),
"= %"PRId64" seconds since 1969\n"),
new_broken_time.tm_hour, new_broken_time.tm_min,
new_broken_time.tm_sec, (long long int)newtime);
new_broken_time.tm_sec, (int64_t)newtime);

if (!ctl->testing)
ur->set_hardware_clock(ctl, &new_broken_time);
Expand Down Expand Up @@ -574,17 +568,17 @@ set_hardware_clock_exact(const struct hwclock_control *ctl,
if (ticksize < 0) {
if (ctl->verbose)
printf(_("time jumped backward %.6f seconds "
"to %lld.%06lld - retargeting\n"),
ticksize, (long long int)nowsystime.tv_sec,
(long long int)nowsystime.tv_usec);
"to %"PRId64".%06"PRId64" - retargeting\n"),
ticksize, (int64_t)nowsystime.tv_sec,
(int64_t)nowsystime.tv_usec);
/* The retarget is handled at the end of the loop. */
} else if (deltavstarget < 0) {
/* deltavstarget < 0 if current time < target time */
DBG(DELTA_VS_TARGET,
ul_debug("%lld.%06lld < %lld.%06lld (%.6f)",
(long long int)nowsystime.tv_sec, (long long int)nowsystime.tv_usec,
(long long int)targetsystime.tv_sec,
(long long int)targetsystime.tv_usec, deltavstarget));
ul_debug("%"PRId64".%06"PRId64" < %"PRId64".%06"PRId64" (%.6f)",
(int64_t)nowsystime.tv_sec, (int64_t)nowsystime.tv_usec,
(int64_t)targetsystime.tv_sec,
(int64_t)targetsystime.tv_usec, deltavstarget));
continue; /* not there yet - keep spinning */
} else if (deltavstarget <= target_time_tolerance_secs) {
/* Close enough to the target time; done waiting. */
Expand All @@ -595,12 +589,12 @@ set_hardware_clock_exact(const struct hwclock_control *ctl,
* aim for the next opportunity.
*/
if (ctl->verbose)
printf(_("missed it - %lld.%06lld is too far "
"past %lld.%06lld (%.6f > %.6f)\n"),
(long long int)nowsystime.tv_sec,
(long long int)nowsystime.tv_usec,
(long long int)targetsystime.tv_sec,
(long long int)targetsystime.tv_usec,
printf(_("missed it - %"PRId64".%06"PRId64" is too far "
"past %"PRId64".%06"PRId64" (%.6f > %.6f)\n"),
(int64_t)nowsystime.tv_sec,
(int64_t)nowsystime.tv_usec,
(int64_t)targetsystime.tv_sec,
(int64_t)targetsystime.tv_usec,
deltavstarget,
target_time_tolerance_secs);
target_time_tolerance_secs += tolerance_incr_secs;
Expand All @@ -622,14 +616,14 @@ set_hardware_clock_exact(const struct hwclock_control *ctl,
+ ceil(time_diff(nowsystime, refsystime)
- delay /* don't count this */);
if (ctl->verbose)
printf(_("%lld.%06lld is close enough to %lld.%06lld (%.6f < %.6f)\n"
"Set RTC to %lld (%lld + %d; refsystime = %lld.%06lld)\n"),
(long long int)nowsystime.tv_sec, (long long int)nowsystime.tv_usec,
(long long int)targetsystime.tv_sec, (long long int)targetsystime.tv_usec,
printf(_("%"PRId64".%06"PRId64" is close enough to %"PRId64".%06"PRId64" (%.6f < %.6f)\n"
"Set RTC to %"PRId64" (%"PRId64" + %d; refsystime = %"PRId64".%06"PRId64")\n"),
(int64_t)nowsystime.tv_sec, (int64_t)nowsystime.tv_usec,
(int64_t)targetsystime.tv_sec, (int64_t)targetsystime.tv_usec,
deltavstarget, target_time_tolerance_secs,
(long long int)newhwtime, (long long int)sethwtime,
(int)((long long int)newhwtime - (long long int)sethwtime),
(long long int)refsystime.tv_sec, (long long int)refsystime.tv_usec);
(int64_t)newhwtime, (int64_t)sethwtime,
(int)((int64_t)newhwtime - (int64_t)sethwtime),
(int64_t)refsystime.tv_sec, (int64_t)refsystime.tv_usec);

set_hardware_clock(ctl, newhwtime);
}
Expand Down Expand Up @@ -728,9 +722,9 @@ set_system_clock(const struct hwclock_control *ctl,
minuteswest);

if (ctl->hctosys)
printf(_("Calling settimeofday(%lld.%06lld, NULL) "
printf(_("Calling settimeofday(%"PRId64".%06"PRId64", NULL) "
"to set the System time.\n"),
(long long int)newtime.tv_sec, (long long int)newtime.tv_usec);
(int64_t)newtime.tv_sec, (int64_t)newtime.tv_usec);
}

if (!ctl->testing) {
Expand Down Expand Up @@ -873,12 +867,12 @@ calculate_adjustment(const struct hwclock_control *ctl,
tdrift_p->tv_usec = (exact_adjustment -
(double)tdrift_p->tv_sec) * 1E6;
if (ctl->verbose) {
printf(P_("Time since last adjustment is %lld second\n",
"Time since last adjustment is %lld seconds\n",
((long long int)systime - (long long int)last_time)),
((long long int)systime - (long long int)last_time));
printf(_("Calculated Hardware Clock drift is %lld.%06lld seconds\n"),
(long long int)tdrift_p->tv_sec, (long long int)tdrift_p->tv_usec);
printf(P_("Time since last adjustment is %"PRId64" second\n",
"Time since last adjustment is %"PRId64" seconds\n",
((int64_t)systime - (int64_t)last_time)),
((int64_t)systime - (int64_t)last_time));
printf(_("Calculated Hardware Clock drift is %"PRId64".%06"PRId64" seconds\n"),
(int64_t)tdrift_p->tv_sec, (int64_t)tdrift_p->tv_usec);
}
}

Expand All @@ -894,11 +888,11 @@ static int save_adjtime(const struct hwclock_control *ctl,
char *content; /* Stuff to write to disk file */
FILE *fp;

xasprintf(&content, "%f %lld %f\n%lld\n%s\n",
xasprintf(&content, "%f %"PRId64" %f\n%"PRId64"\n%s\n",
adjtime->drift_factor,
(long long int)adjtime->last_adj_time,
(int64_t)adjtime->last_adj_time,
adjtime->not_adjusted,
(long long int)adjtime->last_calib_time,
(int64_t)adjtime->last_calib_time,
(adjtime->local_utc == LOCAL) ? "LOCAL" : "UTC");

if (ctl->verbose){
Expand Down Expand Up @@ -1040,8 +1034,8 @@ manipulate_clock(const struct hwclock_control *ctl, const time_t set_time,
hclocktime = time_inc(hclocktime, (double)
-(tdrift.tv_sec + tdrift.tv_usec / 1E6));
if (ctl->verbose) {
printf(_ ("Target date: %lld\n"), (long long int)set_time);
printf(_ ("Predicted RTC: %lld\n"), (long long int)hclocktime.tv_sec);
printf(_("Target date: %"PRId64"\n"), (int64_t)set_time);
printf(_("Predicted RTC: %"PRId64"\n"), (int64_t)hclocktime.tv_sec);
}
return display_time(hclocktime);
}
Expand Down Expand Up @@ -1471,8 +1465,8 @@ int main(int argc, char **argv)

if (ctl.verbose) {
out_version();
printf(_("System Time: %lld.%06lld\n"),
(long long int)startup_time.tv_sec, (long long int)startup_time.tv_usec);
printf(_("System Time: %"PRId64".%06"PRId64"\n"),
(int64_t)startup_time.tv_sec, (int64_t)startup_time.tv_usec);
}

if (!ctl.systz && !ctl.predict)
Expand Down

0 comments on commit ce3355c

Please sign in to comment.