From: "tip-bot2 for Andrei Vagin" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Hans van der Laan <j.h.vanderlaan@student.utwente.nl>,
Andrei Vagin <avagin@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>, <stable@vger.kernel.org>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/urgent] futex: Adjust futex absolute timeouts with per-timens offset
Date: Thu, 15 Oct 2020 09:35:33 -0000 [thread overview]
Message-ID: <160275453357.7002.8741717735459699835.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201015072909.271426-1-avagin@gmail.com>
The following commit has been merged into the timers/urgent branch of tip:
Commit-ID: 06764291690f8650a9f96dea42cc0dd4138d47d5
Gitweb: https://git.kernel.org/tip/06764291690f8650a9f96dea42cc0dd4138d47d5
Author: Andrei Vagin <avagin@gmail.com>
AuthorDate: Thu, 15 Oct 2020 00:29:08 -07:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 15 Oct 2020 11:24:04 +02:00
futex: Adjust futex absolute timeouts with per-timens offset
For all commands except FUTEX_WAIT, timeout is interpreted as an absolute
value. This absolute value is inside the task's time namespace and has to
be converted to the host's time.
Fixes: 5a590f35add9 ("posix-clocks: Wire up clock_gettime() with timens offsets")
Reported-by: Hans van der Laan <j.h.vanderlaan@student.utwente.nl>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20201015072909.271426-1-avagin@gmail.com
---
kernel/futex.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/futex.c b/kernel/futex.c
index a587669..9ff2b8c 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -39,6 +39,7 @@
#include <linux/freezer.h>
#include <linux/memblock.h>
#include <linux/fault-inject.h>
+#include <linux/time_namespace.h>
#include <asm/futex.h>
@@ -3797,6 +3798,8 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
t = timespec64_to_ktime(ts);
if (cmd == FUTEX_WAIT)
t = ktime_add_safe(ktime_get(), t);
+ else if (!(cmd & FUTEX_CLOCK_REALTIME))
+ t = timens_ktime_to_host(CLOCK_MONOTONIC, t);
tp = &t;
}
/*
next prev parent reply other threads:[~2020-10-15 9:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 7:29 [PATCH 1/2] futex: adjust a futex timeout with a per-timens offset Andrei Vagin
2020-10-15 9:35 ` tip-bot2 for Andrei Vagin [this message]
2020-10-15 13:26 ` Dmitry Safonov
2020-10-15 14:13 ` Thomas Gleixner
2020-10-16 8:18 ` Andrei Vagin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160275453357.7002.8741717735459699835.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=avagin@gmail.com \
--cc=j.h.vanderlaan@student.utwente.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).