From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 17 Dec 2019 10:22:17 +0000 (+0100)
Subject: time-util: deal with systems where userspace has 64bit time_t but kernel does not
X-Git-Tag: v245-rc1~244
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=601f91bec5646a9c6fbd4f1ec5f1b4ae28d3a770;p=thirdparty%2Fsystemd.git

time-util: deal with systems where userspace has 64bit time_t but kernel does not

Fixes: #14362
---

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index bfe2c60da17..753f8d51746 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1500,8 +1500,29 @@ int time_change_fd(void) {
         if (fd < 0)
                 return -errno;
 
-        if (timerfd_settime(fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) < 0)
-                return -errno;
+        if (timerfd_settime(fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) >= 0)
+                return TAKE_FD(fd);
+
+        /* So apparently there are systems where time_t is 64bit, but the kernel actually doesn't support
+         * 64bit time_t. In that case configuring a timer to TIME_T_MAX will fail with EOPNOTSUPP or a
+         * similar error. If that's the case let's try with INT32_MAX instead, maybe that works. It's a bit
+         * of a black magic thing though, but what can we do?
+         *
+         * We don't want this code on x86-64, hence let's conditionalize this for systems with 64bit time_t
+         * but where "long" is shorter than 64bit, i.e. 32bit archs.
+         *
+         * See: https://github.com/systemd/systemd/issues/14362 */
+
+#if SIZEOF_TIME_T == 8 && ULONG_MAX < UINT64_MAX
+        if (ERRNO_IS_NOT_SUPPORTED(errno)) {
+                static const struct itimerspec its32 = {
+                        .it_value.tv_sec = INT32_MAX,
+                };
+
+                if (timerfd_settime(fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its32, NULL) >= 0)
+                        return TAKE_FD(fd);
+        }
+#endif
 
-        return TAKE_FD(fd);
+        return -errno;
 }