mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-04 16:25:31 +00:00
Code Issues Releases Wiki Activity

crtools: close all desriptors only for the root task

Browse Source 
For all other tasks only unsed service descriptors will be closed.

This change allows to have file descriptors, which may be used for
restoring namespaces. All non-server descriptors must be closed before
restoring files.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2014-04-09 04:13:29 +04:00
committed by Pavel Emelyanov
parent bb5bba53b8
commit d36e07aabe
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cr-restore.c
View File

@@ -1213,15 +1213,24 @@ static int restore_task_with_children(void *_arg)
current->pid.real, current->pid.virt);
}
if ( !(ca->clone_flags & CLONE_FILES))
close_safe(&ca->fd);
if (current->state != TASK_HELPER) {
ret = clone_service_fd(current->rst->service_fd_id);
if (ret)
exit(1);
}
if (!(ca->clone_flags & CLONE_FILES)) {
close_safe(&ca->fd);
if (current->parent && current->parent->rst->fdt)
/*
* We're the first child with our own fdtable of
* a parent which had it shared. From that parent
* we have extra service file descriptors left.
*/
close_old_servie_fd(current->parent->rst->fdt->nr);
}
pid = getpid();
if (current->pid.virt != pid) {
pr_err("Pid %d do not match expected %d\n", pid, current->pid.virt);
@@ -1237,6 +1246,9 @@ static int restore_task_with_children(void *_arg)
if (restore_finish_stage(CR_STATE_RESTORE_NS) < 0)
exit(1);
if (close_old_fds(current))
exit(1);
if (collect_mount_info(getpid()))
exit(1);
@@ -1271,12 +1283,6 @@ static int restore_task_with_children(void *_arg)
if (prepare_mappings(pid))
exit(1);
if (!(ca->clone_flags & CLONE_FILES)) {
ret = close_old_fds(current);
if (ret)
exit(1);
}
if (create_children_and_session())
exit(1);

1
include/servicefd.h
View File

@@ -25,6 +25,7 @@ extern int get_service_fd(enum sfd_type type);
extern int reserve_service_fd(enum sfd_type type);
extern int install_service_fd(enum sfd_type type, int fd);
extern int close_service_fd(enum sfd_type type);
extern void close_old_servie_fd(int nr);
extern bool is_service_fd(int fd, enum sfd_type type);
extern bool is_any_service_fd(int fd);

12
util.c
View File

@@ -341,6 +341,18 @@ int close_service_fd(enum sfd_type type)
return 0;
}
/* Close all unused service descriptors on a depth of nr. */
void close_old_servie_fd(int nr)
{
int level, i;
BUG_ON(service_fd_id != 0);
for (level = 1; level < nr; level++) {
for (i = SERVICE_FD_MIN + 1; i < SERVICE_FD_MAX; i++) {
close(__get_service_fd(i, level));
}
}
}
int clone_service_fd(int id)
{
int ret = -1, i;