Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
73e3925b
Commit
73e3925b
authored
Jun 25, 2015
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pstree_item: Keep has_seccomp field on rst_info tail
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
24f0f498
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
cr-restore.c
cr-restore.c
+2
-2
pstree.h
include/pstree.h
+0
-6
rst_info.h
include/rst_info.h
+7
-0
No files found.
cr-restore.c
View file @
73e3925b
...
...
@@ -1055,7 +1055,7 @@ static inline int fork_with_pid(struct pstree_item *item)
item
->
state
=
ca
.
core
->
tc
->
task_state
;
rsti
(
item
)
->
cg_set
=
ca
.
core
->
tc
->
cg_set
;
item
->
has_seccomp
=
ca
.
core
->
tc
->
seccomp_mode
!=
SECCOMP_MODE_DISABLED
;
rsti
(
item
)
->
has_seccomp
=
ca
.
core
->
tc
->
seccomp_mode
!=
SECCOMP_MODE_DISABLED
;
if
(
item
->
state
==
TASK_DEAD
)
rsti
(
item
->
parent
)
->
nr_zombies
++
;
...
...
@@ -1686,7 +1686,7 @@ static void finalize_restore(int status)
* doing an munmap in the process, which may be blocked by
* seccomp and cause the task to be killed.
*/
if
(
item
->
has_seccomp
&&
suspend_seccomp
(
pid
)
<
0
)
if
(
rsti
(
item
)
->
has_seccomp
&&
suspend_seccomp
(
pid
)
<
0
)
pr_err
(
"failed to suspend seccomp, restore will probably fail...
\n
"
);
ctl
=
parasite_prep_ctl
(
pid
,
NULL
);
...
...
include/pstree.h
View file @
73e3925b
...
...
@@ -24,12 +24,6 @@ struct pstree_item {
int
state
;
/* TASK_XXX constants */
/*
* On restore, we set this flag when process has seccomp filters so
* that we know to suspend them before we unmap the restorer blob.
*/
bool
has_seccomp
;
int
nr_threads
;
/* number of threads */
struct
pid
*
threads
;
/* array of threads */
CoreEntry
**
core
;
...
...
include/rst_info.h
View file @
73e3925b
...
...
@@ -58,6 +58,13 @@ struct rst_info {
bool
has_umask
;
u32
umask
;
/*
* We set this flag when process has seccomp filters
* so that we know to suspend them before we unmap the
* restorer blob.
*/
bool
has_seccomp
;
void
*
breakpoint
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment