mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 22:35:33 +00:00
Code Issues Releases Wiki Activity

mnt: Put root fd to fdstore

Browse Source 
mntns_get_root_fd() may be called by a task from
!root_user_ns, and it fails if so.

Put root fd to fdstore to allow use it every task.

v3: New

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai
2017-05-05 19:12:49 +03:00
committed by Andrei Vagin
parent 9c7195ff39
commit 1dce09bb14
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
criu/include/namespaces.h
View File

@@ -121,7 +121,7 @@ struct ns_id {
struct mount_info *mntinfo_list; struct mount_info *mntinfo_list;
struct mount_info *mntinfo_tree; struct mount_info *mntinfo_tree;
int ns_fd; int ns_fd;
int root_fd; int root_fd_id;
} mnt; } mnt;
struct { struct {

19
criu/mount.c
View File

@@ -26,6 +26,7 @@
#include "path.h" #include "path.h"
#include "files-reg.h" #include "files-reg.h"
#include "external.h" #include "external.h"
#include "fdstore.h"
#include "images/mnt.pb-c.h" #include "images/mnt.pb-c.h"
@@ -2788,7 +2789,6 @@ void fini_restore_mntns(void)
if (nsid->nd != &mnt_ns_desc) if (nsid->nd != &mnt_ns_desc)
continue; continue;
close_safe(&nsid->mnt.ns_fd); close_safe(&nsid->mnt.ns_fd);
close_safe(&nsid->mnt.root_fd);
nsid->ns_populated = true; nsid->ns_populated = true;
} }
} }
@@ -2982,7 +2982,7 @@ void cleanup_mnt_ns(void)
int prepare_mnt_ns(void) int prepare_mnt_ns(void)
{ {
int ret = -1, rst = -1; int ret = -1, rst = -1, fd;
struct ns_id ns = { .type = NS_CRIU, .ns_pid = PROC_SELF, .nd = &mnt_ns_desc }; struct ns_id ns = { .type = NS_CRIU, .ns_pid = PROC_SELF, .nd = &mnt_ns_desc };
struct ns_id *nsid; struct ns_id *nsid;
@@ -3069,10 +3069,17 @@ int prepare_mnt_ns(void)
if (cr_pivot_root(path)) if (cr_pivot_root(path))
goto err; goto err;
/* root_fd is used to restore file mappings */ /* root fd is used to restore file mappings */
nsid->mnt.root_fd = open_proc(PROC_SELF, "root"); fd = open_proc(PROC_SELF, "root");
if (nsid->mnt.root_fd < 0) if (fd < 0)
goto err; goto err;
nsid->mnt.root_fd_id = fdstore_add(fd);
if (nsid->mnt.root_fd_id < 0) {
pr_err("Can't add root fd\n");
close(fd);
goto err;
}
close(fd);
/* And return back to regain the access to the roots yard */ /* And return back to regain the access to the roots yard */
if (setns(rst, CLONE_NEWNS)) { if (setns(rst, CLONE_NEWNS)) {
@@ -3187,7 +3194,7 @@ int mntns_get_root_fd(struct ns_id *mntns)
if (!mntns->ns_populated) { if (!mntns->ns_populated) {
int fd; int fd;
fd = open_proc(vpid(root_item), "fd/%d", mntns->mnt.root_fd); fd = fdstore_get(mntns->mnt.root_fd_id);
if (fd < 0) if (fd < 0)
return -1; return -1;

13
criu/sk-unix.c
View File

@@ -28,6 +28,7 @@
#include "pstree.h" #include "pstree.h"
#include "external.h" #include "external.h"
#include "crtools.h" #include "crtools.h"
#include "fdstore.h"
#include "protobuf.h" #include "protobuf.h"
#include "images/sk-unix.pb-c.h" #include "images/sk-unix.pb-c.h"
@@ -1036,6 +1037,7 @@ static void revert_unix_sk_cwd(int *prev_cwd_fd, int *root_fd)
static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd, int *prev_root_fd) static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd, int *prev_root_fd)
{ {
static struct ns_id *root = NULL; static struct ns_id *root = NULL;
int fd;
*prev_cwd_fd = open(".", O_RDONLY); *prev_cwd_fd = open(".", O_RDONLY);
if (*prev_cwd_fd < 0) { if (*prev_cwd_fd < 0) {
@@ -1052,10 +1054,17 @@ static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd, int *prev
goto err; goto err;
} }
if (fchdir(root->mnt.root_fd)) { fd = fdstore_get(root->mnt.root_fd_id);
pr_perror("Unable to change current working dir"); if (fd < 0) {
pr_err("Can't get root fd\n");
goto err; goto err;
} }
if (fchdir(fd)) {
pr_perror("Unable to change current working dir");
close(fd);
goto err;
}
close(fd);
if (chroot(".")) { if (chroot(".")) {
pr_perror("Unable to change root directory"); pr_perror("Unable to change root directory");
goto err; goto err;