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
55cbb1a6
Unverified
Commit
55cbb1a6
authored
Oct 23, 2020
by
Ruben Jenster
Committed by
Christian Brauner
Dec 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
seccomp: Avoid duplicate processing of rules for host native arch.
Signed-off-by:
Ruben Jenster
<
r.jenster@drachenfels.de
>
parent
687f9b9b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
15 deletions
+9
-15
seccomp.c
src/lxc/seccomp.c
+9
-15
No files found.
src/lxc/seccomp.c
View file @
55cbb1a6
...
@@ -653,6 +653,8 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
...
@@ -653,6 +653,8 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
default_rule_action
=
SCMP_ACT_ALLOW
;
default_rule_action
=
SCMP_ACT_ALLOW
;
}
}
DEBUG
(
"Host native arch is [%u]"
,
seccomp_arch_native
());
memset
(
&
ctx
,
0
,
sizeof
(
ctx
));
memset
(
&
ctx
,
0
,
sizeof
(
ctx
));
ctx
.
architectures
[
0
]
=
SCMP_ARCH_NATIVE
;
ctx
.
architectures
[
0
]
=
SCMP_ARCH_NATIVE
;
ctx
.
architectures
[
1
]
=
SCMP_ARCH_NATIVE
;
ctx
.
architectures
[
1
]
=
SCMP_ARCH_NATIVE
;
...
@@ -1001,23 +1003,15 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
...
@@ -1001,23 +1003,15 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
if
(
ret
==
lxc_seccomp_rule_undefined_syscall
)
if
(
ret
==
lxc_seccomp_rule_undefined_syscall
)
continue
;
continue
;
if
(
ctx
.
architectures
[
0
]
!=
SCMP_ARCH_NATIVE
)
{
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
if
(
lxc_seccomp_rule_err
==
do_resolve_add_rule
(
ctx
.
architectures
[
0
],
line
,
uint32_t
arch
=
ctx
.
architectures
[
i
];
ctx
.
contexts
[
0
],
&
rule
))
if
(
arch
!=
SCMP_ARCH_NATIVE
&&
arch
!=
seccomp_arch_native
())
{
goto
bad_rule
;
if
(
lxc_seccomp_rule_err
==
do_resolve_add_rule
(
arch
,
line
,
}
ctx
.
contexts
[
i
],
&
rule
))
goto
bad_rule
;
if
(
ctx
.
architectures
[
1
]
!=
SCMP_ARCH_NATIVE
)
{
}
if
(
lxc_seccomp_rule_err
==
do_resolve_add_rule
(
ctx
.
architectures
[
1
],
line
,
ctx
.
contexts
[
1
],
&
rule
))
goto
bad_rule
;
}
}
if
(
ctx
.
architectures
[
2
]
!=
SCMP_ARCH_NATIVE
)
{
if
(
lxc_seccomp_rule_err
==
do_resolve_add_rule
(
ctx
.
architectures
[
2
],
line
,
ctx
.
contexts
[
2
],
&
rule
))
goto
bad_rule
;
}
}
}
INFO
(
"Merging compat seccomp contexts into main context"
);
INFO
(
"Merging compat seccomp contexts into main context"
);
...
...
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