mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 05:48:05 +00:00
Code Issues Releases Wiki Activity

compel/infect: Warn if close() failed on memfd

Browse Source 
As a preparation for __must_check on compel_syscall(), check it on
close() too - maybe not as useful as with other syscalls, but why not.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Dmitry Safonov 2019-11-09 22:20:36 +00:00 committed by Andrei Vagin
parent a93117ede1
commit c8f16bfacb
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compel/src/lib/infect.c
View File

@ -718,14 +718,25 @@ static int parasite_mmap_exchange(struct parasite_ctl *ctl, unsigned long size)
return 0; return 0;
} }
static void parasite_memfd_close(struct parasite_ctl *ctl, int fd)
{
bool __maybe_unused compat = !compel_mode_native(ctl);
long ret;
int err;
err = compel_syscall(ctl, __NR(close, compat), &ret, fd, 0, 0, 0, 0, 0);
if (err || ret)
pr_err("Can't close memfd\n");
}
static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size) static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
{ {
void *where = (void *)ctl->ictx.syscall_ip + BUILTIN_SYSCALL_SIZE; void *where = (void *)ctl->ictx.syscall_ip + BUILTIN_SYSCALL_SIZE;
bool __maybe_unused compat_task = !compel_mode_native(ctl);
uint8_t orig_code[MEMFD_FNAME_SZ] = MEMFD_FNAME; uint8_t orig_code[MEMFD_FNAME_SZ] = MEMFD_FNAME;
pid_t pid = ctl->rpid; pid_t pid = ctl->rpid;
long sret = -ENOSYS; long sret = -ENOSYS;
int ret, fd, lfd; int ret, fd, lfd;
bool __maybe_unused compat_task = !compel_mode_native(ctl);
if (ctl->ictx.flags & INFECT_NO_MEMFD) if (ctl->ictx.flags & INFECT_NO_MEMFD)
return 1; return 1;
@ -741,10 +752,9 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
(unsigned long)where, 0, 0, 0, 0, 0); (unsigned long)where, 0, 0, 0, 0, 0);
if (ptrace_poke_area(pid, orig_code, where, sizeof(orig_code))) { if (ptrace_poke_area(pid, orig_code, where, sizeof(orig_code))) {
fd = (int)(long)sret; fd = (int)sret;
if (fd >= 0) if (fd >= 0)
compel_syscall(ctl, __NR(close, compat_task), &sret, parasite_memfd_close(ctl, fd);
fd, 0, 0, 0, 0, 0);
pr_err("Can't restore memfd args (pid: %d)\n", pid); pr_err("Can't restore memfd args (pid: %d)\n", pid);
return -1; return -1;
} }
@ -752,7 +762,7 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
if (ret < 0) if (ret < 0)
return ret; return ret;
fd = (int)(long)sret; fd = (int)sret;
if (fd == -ENOSYS) if (fd == -ENOSYS)
return 1; return 1;
if (fd < 0) { if (fd < 0) {
@ -787,7 +797,7 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
goto err_curef; goto err_curef;
} }
compel_syscall(ctl, __NR(close, compat_task), &sret, fd, 0, 0, 0, 0, 0); parasite_memfd_close(ctl, fd);
close(lfd); close(lfd);
pr_info("Set up parasite blob using memfd\n"); pr_info("Set up parasite blob using memfd\n");
@ -796,7 +806,7 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
err_curef: err_curef:
close(lfd); close(lfd);
err_cure: err_cure:
compel_syscall(ctl, __NR(close, compat_task), &sret, fd, 0, 0, 0, 0, 0); parasite_memfd_close(ctl, fd);
return -1; return -1;
} }