mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-27 20:23:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

timedated: extra overflow safety check when doing relative time changes

Browse Source 
Ensure clients don't overflow usec_t when doing relative time changes.
This is mostly just paranoia and protection against accidents, after all
clients are already authenticated, and they can se the time to any
value they wish anyway, but better be safe than sorry.

https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1152187/comments/14
This commit is contained in:
Lennart Poettering 2013-03-22 21:35:53 +01:00
parent bfa00bc6c0
commit 86e7b6e3f6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/timedate/timedated.c
View File

@ -816,15 +816,24 @@ static DBusHandlerResult timedate_message_handler(
struct timespec ts;
struct tm* tm;
if (relative) {
usec_t n, x;
n = now(CLOCK_REALTIME);
x = n + utc;
if ((utc > 0 && x < n) ||
(utc < 0 && x > n))
return bus_send_error_reply(connection, message, NULL, -EOVERFLOW);
timespec_store(&ts, x);
} else
timespec_store(&ts, (usec_t) utc);
r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-time", interactive, NULL, &error);
if (r < 0)
return bus_send_error_reply(connection, message, &error, r);
if (relative)
timespec_store(&ts, now(CLOCK_REALTIME) + utc);
else
timespec_store(&ts, utc);
/* Set system clock */
if (clock_settime(CLOCK_REALTIME, &ts) < 0) {
log_error("Failed to set local time: %m");