[4/4] mount: set is_ns_root on dump

Submitted by Andrei Vagin on Oct. 28, 2016, 7:19 a.m.

Details

Message ID 1477639147-17491-5-git-send-email-avagin@openvz.org
State Superseded
Series "Fix a few issues to dump/restore Docker containers with userns"
Headers show

Commit Message

Andrei Vagin Oct. 28, 2016, 7:19 a.m.
From: Andrei Vagin <avagin@virtuozzo.com>

It is required to not dump content of the root mount in dump_one_fd().

Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 criu/proc_parse.c | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index c73798a..0a0de7d 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -37,6 +37,7 @@ 
 #include "cgroup.h"
 #include "cgroup-props.h"
 #include "timerfd.h"
+#include "path.h"
 
 #include "protobuf.h"
 #include "images/fdinfo.pb-c.h"
@@ -1318,6 +1319,7 @@  static int parse_mountinfo_ent(char *str, struct mount_info *new, char **fsname)
 	if (!new->mountpoint)
 		goto err;
 	new->ns_mountpoint = new->mountpoint;
+	new->is_ns_root = is_root(new->ns_mountpoint + 1);
 
 	new->s_dev = new->s_dev_rt = MKKDEV(kmaj, kmin);
 	new->flags = 0;