From ab5e52f6a35b18d4ba98b2d5e095f056d4e46fd8 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Tue, 17 Nov 2015 14:01:04 -0600 Subject: [PATCH] Revert "seccomp: handle inverted arch" It breaks container starts. This reverts commit 473ebc77d6762c2ec49fe59983dabc04f695fd01. --- src/lxc/seccomp.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c index 9eab6af9d..020864645 100644 --- a/src/lxc/seccomp.c +++ b/src/lxc/seccomp.c @@ -296,19 +296,10 @@ 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; - } + compat_ctx = get_new_ctx(lxc_seccomp_arch_i386, + default_policy_action); + if (!compat_ctx) + goto bad; } if (default_policy_action != SCMP_ACT_KILL) { -- 2.47.3