mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-01 17:49:28 +00:00
Code Issues Releases Wiki Activity

Revert "seccomp: handle inverted arch"

Browse Source 
It breaks container starts.

This reverts commit 473ebc77d6.
This commit is contained in:
Serge Hallyn
2015-11-17 14:01:04 -06:00
parent 3afe9d723d
commit ab5e52f6a3
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lxc/seccomp.c
View File

@@ -296,20 +296,11 @@ static int parse_config_v2(FILE *f, char *line, struct lxc_conf *conf)
if (native_arch == lxc_seccomp_arch_amd64) {
cur_rule_arch = lxc_seccomp_arch_all;
compat_arch = SCMP_ARCH_X86;
// Detect if we are on x86_64 kernel with 32-bit userspace
if (seccomp_arch_exist(conf->seccomp_ctx, SCMP_ARCH_X86)) {
compat_ctx = conf->seccomp_ctx;
conf->seccomp_ctx = get_new_ctx(lxc_seccomp_arch_amd64,
default_policy_action);
if (!conf->seccomp_ctx)
goto bad;
} else {
compat_ctx = get_new_ctx(lxc_seccomp_arch_i386,
default_policy_action);
if (!compat_ctx)
goto bad;
}
}
if (default_policy_action != SCMP_ACT_KILL) {
ret = seccomp_reset(conf->seccomp_ctx, default_policy_action);