The following commit has been merged into the timers/urgent branch of tip:

Commit-ID: b801f1e22c23c259d6a2c955efddd20370de19a6 Gitweb: https://git.kernel.org/tip/b801f1e22c23c259d6a2c955efddd20370de19a6 Author: Michael Kerrisk (man-pages) mtk.manpages@gmail.com AuthorDate: Fri, 03 Apr 2020 14:11:39 +02:00 Committer: Thomas Gleixner tglx@linutronix.de CommitterDate: Tue, 07 Apr 2020 12:37:21 +02:00

time/namespace: Fix time_for_children symlink

Looking at the contents of the /proc/PID/ns/time_for_children symlink shows an anomaly:

$ ls -l /proc/self/ns/* |awk '{print $9, $10, $11}' ... /proc/self/ns/pid -> pid:[4026531836] /proc/self/ns/pid_for_children -> pid:[4026531836] /proc/self/ns/time -> time:[4026531834] /proc/self/ns/time_for_children -> time_for_children:[4026531834] /proc/self/ns/user -> user:[4026531837] ...

The reference for 'time_for_children' should be a 'time' namespace, just as the reference for 'pid_for_children' is a 'pid' namespace. In other words, the above time_for_children link should read:

/proc/self/ns/time_for_children -> time:[4026531834]

Fixes: 769071ac9f20 ("ns: Introduce Time Namespace") Signed-off-by: Michael Kerrisk mtk.manpages@gmail.com Signed-off-by: Thomas Gleixner tglx@linutronix.de Reviewed-by: Dmitry Safonov dima@arista.com Acked-by: Christian Brauner christian.brauner@ubuntu.com Acked-by: Andrei Vagin avagin@gmail.com Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/a2418c48-ed80-3afe-116e-6611cb799557@gmail.com --- kernel/time/namespace.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/kernel/time/namespace.c b/kernel/time/namespace.c index e6ba064..3b30288 100644 --- a/kernel/time/namespace.c +++ b/kernel/time/namespace.c @@ -447,6 +447,7 @@ const struct proc_ns_operations timens_operations = {

const struct proc_ns_operations timens_for_children_operations = { .name = "time_for_children", + .real_ns_name = "time", .type = CLONE_NEWTIME, .get = timens_for_children_get, .put = timens_put,