shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-25 18:50:18 +03:00
Code

timedated: rework clock change overflow check

Browse Source 
Let's use explicit language constructs to test for overflow, the
previous code was ultimately relying on undefined behaviour.
This commit is contained in:
Lennart Poettering 2025-02-18 09:37:41 +01:00
parent 0df15b843e
commit fff6dfc75e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/timedate/timedated.c
View File

@ -877,16 +877,16 @@ static int method_set_time(sd_bus_message *m, void *userdata, sd_bus_error *erro
return sd_bus_reply_method_return(m, NULL);
if (relative) {
usec_t n, x;
n = now(CLOCK_REALTIME);
x = n + utc;
if ((utc > 0 && x < n) ||
(utc < 0 && x > n))
usec_t n = now(CLOCK_REALTIME);
bool valid;
if (utc > 0)
valid = INC_SAFE(&n, (usec_t) utc);
else
valid = DEC_SAFE(&n, (usec_t) -utc);
if (!valid)
return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Time value overflow");
timespec_store(&ts, x);
timespec_store(&ts, n);
} else
timespec_store(&ts, (usec_t) utc);
@ -909,7 +909,7 @@ static int method_set_time(sd_bus_message *m, void *userdata, sd_bus_error *erro
if (r < 0 && r != -ENODATA)
return r;
timespec_store(&ts, timespec_load(&ts) + (now(CLOCK_MONOTONIC) - start));
timespec_store(&ts, timespec_load(&ts) + usec_sub_unsigned(now(CLOCK_MONOTONIC), start));
/* Set system clock */
if (clock_settime(CLOCK_REALTIME, &ts) < 0) {