infect: Move sigmask getter (from ctl) into infec.c

... and hide compel priv from parasite-syscall.
Now it's completely isolated inside compel.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Pavel Emelyanov 2016-09-30 14:58:29 +03:00 committed by Andrei Vagin
parent 329d2c156b
commit 5e75d49946
3 changed files with 8 additions and 2 deletions

View file

@ -79,4 +79,6 @@ extern int compel_unmap(struct parasite_ctl *ctl, unsigned long addr);
extern int compel_mode_native(struct parasite_ctl *ctl);
extern k_rtsigset_t *compel_task_sigmask(struct parasite_ctl *ctl);
#endif

View file

@ -1211,3 +1211,8 @@ int compel_mode_native(struct parasite_ctl *ctl)
{
return user_regs_native(&ctl->orig.regs);
}
k_rtsigset_t *compel_task_sigmask(struct parasite_ctl *ctl)
{
return &ctl->orig.sigmask;
}

View file

@ -43,7 +43,6 @@
#include "infect.h"
#include "infect-rpc.h"
#include "infect-priv.h"
unsigned long get_exec_start(struct vm_area_list *vmas)
{
@ -597,7 +596,7 @@ struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item,
}
parasite_args_size = PARASITE_ARG_SIZE_MIN; /* reset for next task */
memcpy(&item->core[0]->tc->blk_sigset, &ctl->orig.sigmask, sizeof(k_rtsigset_t));
memcpy(&item->core[0]->tc->blk_sigset, compel_task_sigmask(ctl), sizeof(k_rtsigset_t));
dmpi(item)->parasite_ctl = ctl;
return ctl;