Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

compel: infect -- Don't forget to fetch sas early

Browse source 
When infecting victim we construct sigframe to
be able to self-rectore it in case if something
goes wrong. But in case is a targer been using
alternative stack for signal handling it will
be missed in sigframe since we don't fetch it.

Thus add fetching sas on infection stage and
put it into signal frame early.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov 2017-02-20 11:33:42 +03:00 • committed by Pavel Emelyanov
parent e5de898667
commit 6e4d05853d
6 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compel/arch/aarch64/src/lib/infect.c
View file

@ -140,6 +140,17 @@ bool arch_can_dump_task(struct parasite_ctl *ctl)
return true;
}
int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
{
long ret;
int err;
err = compel_syscall(ctl, __NR_sigaltstack,
&ret, 0, (unsigned long)&s->uc.uc_stack,
0, 0, 0, 0);
return err ? err : ret;
}
/*
* Range for task size calculated from the following Linux kernel files:
* arch/arm64/include/asm/memory.h

11
compel/arch/arm/src/lib/infect.c
View file

@ -160,6 +160,17 @@ bool arch_can_dump_task(struct parasite_ctl *ctl)
return true;
}
int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
{
long ret;
int err;
err = compel_syscall(ctl, __NR_sigaltstack,
&ret, 0, (unsigned long)&s->sig.uc.uc_stack,
0, 0, 0, 0);
return err ? err : ret;
}
/*
* Range for task size calculated from the following Linux kernel files:
* arch/arm/include/asm/memory.h

11
compel/arch/ppc64/src/lib/infect.c
View file

@ -442,6 +442,17 @@ bool arch_can_dump_task(struct parasite_ctl *ctl)
return true;
}
int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
{
long ret;
int err;
err = compel_syscall(ctl, __NR_sigaltstack,
&ret, 0, (unsigned long)&s->uc.uc_stack,
0, 0, 0, 0);
return err ? err : ret;
}
/*
* Copied for the Linux kernel arch/powerpc/include/asm/processor.h
*

15
compel/arch/x86/src/lib/infect.c
View file

@ -419,6 +419,21 @@ bool arch_can_dump_task(struct parasite_ctl *ctl)
return true;
}
int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
{
int native = compel_mode_native(ctl);
void *where = native ?
(void *)&s->native.uc.uc_stack :
(void *)&s->compat.uc.uc_stack;
long ret;
int err;
err = compel_syscall(ctl, __NR(sigaltstack, !native),
&ret, 0, (unsigned long)where,
0, 0, 0, 0);
return err ? err : ret;
}
/* Copied from the gdb header gdb/nat/x86-dregs.h */
/* Debug registers' indices. */

1
compel/include/infect-priv.h
View file

@ -59,6 +59,7 @@ extern void *remote_mmap(struct parasite_ctl *ctl,
int flags, int fd, off_t offset);
extern bool arch_can_dump_task(struct parasite_ctl *ctl);
extern int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save, void *arg);
extern int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s);
extern int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
user_regs_struct_t *regs,
user_fpregs_struct_t *fpregs);

7
compel/src/lib/infect.c
View file

@ -894,6 +894,13 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
ctl->r_thread_stack = ctl->remote_map + p;
}
ret = arch_fetch_sas(ctl, ctl->rsigframe);
if (ret) {
pr_err("Can't fetch sigaltstack for task %d (ret %d)",
ctl->rpid, ret);
goto err;
}
if (parasite_start_daemon(ctl))
goto err;