mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 15:55:53 +00:00
Code Issues Releases Wiki Activity

epoll: Exit with error if tfd is missing

Browse Source 
If we can't find target file descriptor we should
exit on dump with error instead of skipping it.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov
2018-07-04 18:51:43 +03:00
committed by Andrei Vagin
parent fa989970ec
commit d026ba1cdd
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
criu/eventpoll.c
View File

@@ -129,9 +129,8 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
{ {
FileEntry fe = FILE_ENTRY__INIT; FileEntry fe = FILE_ENTRY__INIT;
EventpollFileEntry e = EVENTPOLL_FILE_ENTRY__INIT; EventpollFileEntry e = EVENTPOLL_FILE_ENTRY__INIT;
EventpollTfdEntry **tfd_cpy = NULL;
ssize_t i, j, n_tfd_cpy;
uint32_t *toff = NULL; uint32_t *toff = NULL;
ssize_t i, j;
int ret = -1; int ret = -1;
e.id = id; e.id = id;
@@ -145,11 +144,6 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
fe.id = e.id; fe.id = e.id;
fe.epfd = &e; fe.epfd = &e;
n_tfd_cpy = e.n_tfd;
tfd_cpy = xmemdup(e.tfd, sizeof(e.tfd[0]) * e.n_tfd);
if (!tfd_cpy)
goto out;
/* /*
* In regular case there is no so many dup'ed * In regular case there is no so many dup'ed
* descriptors so instead of complex mappings * descriptors so instead of complex mappings
@@ -178,17 +172,16 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
* pid's file set. * pid's file set.
*/ */
if (p->dfds) { if (p->dfds) {
for (i = j = 0; i < e.n_tfd; i++) { for (i = 0; i < e.n_tfd; i++) {
int tfd = find_tfd(p->pid, p->fd, p->dfds->fds, int tfd = find_tfd(p->pid, p->fd, p->dfds->fds,
p->dfds->nr_fds, e.tfd[i]->tfd, toff[i]); p->dfds->nr_fds, e.tfd[i]->tfd, toff[i]);
if (tfd == -1) { if (tfd == -1) {
pr_warn("Escaped/closed fd descriptor %d on pid %d, ignoring\n", pr_err("Escaped/closed fd descriptor %d on pid %d\n",
e.tfd[i]->tfd, p->pid); e.tfd[i]->tfd, p->pid);
continue; goto out;
} }
e.tfd[j++]->tfd = tfd; e.tfd[i]->tfd = tfd;
} }
e.n_tfd = j; /* New amount of "valid" fds */
} else } else
pr_warn_once("Unix SCM files are not verified\n"); pr_warn_once("Unix SCM files are not verified\n");
@@ -199,13 +192,9 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
pr_info_eventpoll_tfd("Dumping: ", e.id, e.tfd[i]); pr_info_eventpoll_tfd("Dumping: ", e.id, e.tfd[i]);
} }
/* Restore former values to free resources */
memcpy(e.tfd, tfd_cpy, sizeof(e.tfd[0]) * n_tfd_cpy);
e.n_tfd = n_tfd_cpy;
out: out:
for (i = 0; i < e.n_tfd; i++) for (i = 0; i < e.n_tfd; i++)
eventpoll_tfd_entry__free_unpacked(e.tfd[i], NULL); eventpoll_tfd_entry__free_unpacked(e.tfd[i], NULL);
xfree(tfd_cpy);
xfree(e.tfd); xfree(e.tfd);
xfree(toff); xfree(toff);