[Devel,RHEL7,COMMIT] ms/ns: allow ns_entries to have custom symlink content

Submitted by Konstantin Khorenko on May 12, 2017, 11:46 a.m.

Details

Message ID 201705121146.v4CBkaJw022323@finist_cl7.x64_64.work.ct
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko May 12, 2017, 11:46 a.m.
The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.32.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.16.1.vz7.32.1
------>
commit df355b3fc60fd97487e7d77f5f92b5617c2c95a6
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Fri May 12 15:46:33 2017 +0400

    ms/ns: allow ns_entries to have custom symlink content
    
    ms commit: 25b14e92af1a563c7331466ca59188f88050bbf0
    
    Patch series "Expose task pid_ns_for_children to userspace".
    
    pid_ns_for_children set by a task is known only to the task itself, and
    it's impossible to identify it from outside.
    
    It's a big problem for checkpoint/restore software like CRIU, because it
    can't correctly handle tasks, that do setns(CLONE_NEWPID) in proccess of
    their work.  If they have a custom pid_ns_for_children before dump, they
    must have the same ns after restore.  Otherwise, restored task bumped
    into enviroment it does not expect.
    
    This patchset solves the problem.  It exposes pid_ns_for_children to ns
    directory in standard way with the name "pid_for_children":
    
    ~# ls /proc/5531/ns -l | grep pid
    lrwxrwxrwx 1 root root 0 Jan 14 16:38 pid -> pid:[4026531836]
    lrwxrwxrwx 1 root root 0 Jan 14 16:38 pid_for_children -> pid:[4026532286]
    
    This patch (of 2):
    
    Make possible to have link content prefix yyy different from the link
    name xxx:
    
    $ readlink /proc/[pid]/ns/xxx
    yyy:[4026531838]
    
    This will be used in next patch.
    
    Link: http://lkml.kernel.org/r/149201120318.6007.7362655181033883000.stgit@localhost.localdomain
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    
    Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Acked-by: Andrei Vagin <avagin@virtuozzo.com>
    Cc: Andreas Gruenbacher <agruenba@redhat.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Paul Moore <paul@paul-moore.com>
    Cc: Eric Biederman <ebiederm@xmission.com>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Serge Hallyn <serge@hallyn.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    
    https://jira.sw.ru/browse/PSBM-58669
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 fs/proc/namespaces.c    | 4 +++-
 include/linux/proc_ns.h | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index 54bdc67..e70c2d3 100644
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -150,6 +150,7 @@  static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl
 	struct proc_inode *ei = PROC_I(inode);
 	const struct proc_ns_operations *ns_ops = ei->ns.ns_ops;
 	struct task_struct *task;
+	const char *link_name;
 	void *ns;
 	char name[50];
 	int len = -EACCES;
@@ -166,7 +167,8 @@  static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl
 	if (!ns)
 		goto out_put_task;
 
-	snprintf(name, sizeof(name), "%s:[%u]", ns_ops->name, ns_ops->inum(ns));
+	link_name = ns_ops->real_ns_name ? : ns_ops->name;
+	snprintf(name, sizeof(name), "%s:[%u]", link_name, ns_ops->inum(ns));
 	len = strlen(name);
 
 	if (len > buflen)
diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
index 5478e14..b8dc2bc 100644
--- a/include/linux/proc_ns.h
+++ b/include/linux/proc_ns.h
@@ -10,6 +10,7 @@  struct nsproxy;
 
 struct proc_ns_operations {
 	const char *name;
+	const char *real_ns_name;
 	int type;
 	void *(*get)(struct task_struct *task);
 	void (*put)(void *ns);