Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
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
Chen Yisong
lxc
Commits
02ca9d75
Unverified
Commit
02ca9d75
authored
Jun 11, 2019
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
seccomp: s/SCMP_ACT_USER_NOTIF/SCMP_ACT_NOTIFY/g
Align with upstream libseccomp. Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
ddf4b77e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
seccomp.c
src/lxc/seccomp.c
+3
-3
No files found.
src/lxc/seccomp.c
View file @
02ca9d75
...
@@ -93,7 +93,7 @@ static const char *get_action_name(uint32_t action)
...
@@ -93,7 +93,7 @@ static const char *get_action_name(uint32_t action)
case
SCMP_ACT_ERRNO
(
0
):
case
SCMP_ACT_ERRNO
(
0
):
return
"errno"
;
return
"errno"
;
#if HAVE_DECL_SECCOMP_NOTIF_GET_FD
#if HAVE_DECL_SECCOMP_NOTIF_GET_FD
case
SCMP_ACT_
USER_NOTIF
:
case
SCMP_ACT_
NOTIFY
:
return
"notify"
;
return
"notify"
;
#endif
#endif
}
}
...
@@ -127,7 +127,7 @@ static uint32_t get_v2_default_action(char *line)
...
@@ -127,7 +127,7 @@ static uint32_t get_v2_default_action(char *line)
ret_action
=
SCMP_ACT_TRAP
;
ret_action
=
SCMP_ACT_TRAP
;
#if HAVE_DECL_SECCOMP_NOTIF_GET_FD
#if HAVE_DECL_SECCOMP_NOTIF_GET_FD
}
else
if
(
strncmp
(
line
,
"notify"
,
6
)
==
0
)
{
}
else
if
(
strncmp
(
line
,
"notify"
,
6
)
==
0
)
{
ret_action
=
SCMP_ACT_
USER_NOTIF
;
ret_action
=
SCMP_ACT_
NOTIFY
;
#endif
#endif
}
else
if
(
line
[
0
])
{
}
else
if
(
line
[
0
])
{
ERROR
(
"Unrecognized seccomp action
\"
%s
\"
"
,
line
);
ERROR
(
"Unrecognized seccomp action
\"
%s
\"
"
,
line
);
...
@@ -942,7 +942,7 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
...
@@ -942,7 +942,7 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
}
}
#if HAVE_DECL_SECCOMP_NOTIF_GET_FD
#if HAVE_DECL_SECCOMP_NOTIF_GET_FD
if
((
rule
.
action
==
SCMP_ACT_
USER_NOTIF
)
&&
if
((
rule
.
action
==
SCMP_ACT_
NOTIFY
)
&&
!
conf
->
seccomp
.
notifier
.
wants_supervision
)
{
!
conf
->
seccomp
.
notifier
.
wants_supervision
)
{
ret
=
seccomp_attr_set
(
conf
->
seccomp
.
seccomp_ctx
,
ret
=
seccomp_attr_set
(
conf
->
seccomp
.
seccomp_ctx
,
SCMP_FLTATR_NEW_LISTENER
,
1
);
SCMP_FLTATR_NEW_LISTENER
,
1
);
...
...
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