From 7af38c85cfa75fa5d1e359332e539bd70480272c Mon Sep 17 00:00:00 2001
From: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Sat, 1 Apr 2017 14:37:37 +0300
Subject: [PATCH] ns: Pack functionality of storing ns fd to store_self_ns()

Move the code to simplify it and to allow to use this function others.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 criu/include/namespaces.h |  1 +
 criu/namespaces.c         | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index f65f791e9..d92b721bd 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -193,6 +193,7 @@ extern int predump_task_ns_ids(struct pstree_item *);
 extern struct ns_id *rst_new_ns_id(unsigned int id, pid_t pid, struct ns_desc *nd, enum ns_type t);
 extern int rst_add_ns_id(unsigned int id, pid_t pid, struct ns_desc *nd);
 extern struct ns_id *lookup_ns_by_id(unsigned int id, struct ns_desc *nd);
+extern int store_self_ns(struct ns_id *ns);
 
 extern int collect_user_namespaces(bool for_dump);
 extern int prepare_userns(pid_t real_pid, UsernsEntry *e);
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 5bb2c50a6..f895a681d 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -2165,6 +2165,20 @@ err_out:
 	return ret;
 }
 
+int store_self_ns(struct ns_id *ns)
+{
+	int fd, id;
+
+	/* Pin one with a file descriptor */
+	fd = open_proc(PROC_SELF, "ns/%s", ns->nd->str);
+	if (fd < 0)
+		return -1;
+
+	id = fdstore_add(fd);
+	close(fd);
+	return id;
+}
+
 enum {
 	NS__CREATED = 1,
 	NS__MAPS_POPULATED,
@@ -2185,7 +2199,7 @@ static int create_user_ns_hierarhy_fn(void *in_arg)
 	futex_t *p_futex = NULL, *futex = NULL;
 	size_t map_size = 2 * 1024 * 1024;
 	void *map = MAP_FAILED, *stack;
-	int status, fd, ret = -1;
+	int status, ret = -1;
 	struct ns_id *me, *child;
 	pid_t pid = -1;
 
@@ -2197,17 +2211,7 @@ static int create_user_ns_hierarhy_fn(void *in_arg)
 		/* Set self pid to allow parent restore user_ns maps */
 		p_arg->pid = get_self_real_pid();
 		futex_set_and_wake(p_futex, NS__CREATED);
-		/*
-		 * Note we can't use open_proc() here after
-		 * clone() with CLONE_FILES but no CLONE_VM.
-		 */
-		fd = open("/proc/self/ns/user", O_RDONLY);
-		if (fd < 0) {
-			pr_perror("Can't get self user ns");
-			goto out;
-		}
-		me->user.nsfd_id = fdstore_add(fd);
-		close(fd);
+		me->user.nsfd_id = store_self_ns(me);
 		if (me->user.nsfd_id < 0) {
 			pr_err("Can't add fd to fdstore\n");
 			goto out;