[PATCH 05/32] timerfd/timens: Take into account ns clock offsets
From: Dmitry Safonov <hidden>
Date: 2019-02-06 00:11:25
Also in:
lkml
Subsystem:
filesystems (vfs and infrastructure), posix clocks and timers, the rest · Maintainers:
Alexander Viro, Christian Brauner, Anna-Maria Behnsen, Frederic Weisbecker, Thomas Gleixner, Linus Torvalds
From: Andrei Vagin <redacted> Make timerfd respect timens offsets. Provide two helpers timens_clock_to_host() timens_clock_from_host() that are useful to wire up timens to different kernel subsystems. Following patches will use timens_clock_from_host(), added here for completeness. Signed-off-by: Andrei Vagin <redacted> Co-developed-by: Dmitry Safonov <redacted> Signed-off-by: Dmitry Safonov <redacted> --- fs/timerfd.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/fs/timerfd.c b/fs/timerfd.c
index 803ca070d42e..c7ae1e371912 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c@@ -26,6 +26,7 @@ #include <linux/syscalls.h> #include <linux/compat.h> #include <linux/rcupdate.h> +#include <linux/time_namespace.h> struct timerfd_ctx { union {
@@ -433,22 +434,27 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags) } static int do_timerfd_settime(int ufd, int flags, - const struct itimerspec64 *new, + struct itimerspec64 *new, struct itimerspec64 *old) { struct fd f; struct timerfd_ctx *ctx; int ret; - if ((flags & ~TFD_SETTIME_FLAGS) || - !itimerspec64_valid(new)) - return -EINVAL; - ret = timerfd_fget(ufd, &f); if (ret) return ret; ctx = f.file->private_data; + if (flags & TFD_TIMER_ABSTIME) + timens_clock_to_host(ctx->clockid, &new->it_value); + + if ((flags & ~TFD_SETTIME_FLAGS) || + !itimerspec64_valid(new)) { + fdput(f); + return -EINVAL; + } + if (isalarm(ctx) && !capable(CAP_WAKE_ALARM)) { fdput(f); return -EPERM;
--
2.20.1