]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Revert "seccomp: handle inverted arch"
authorSerge Hallyn <serge.hallyn@ubuntu.com>
Tue, 17 Nov 2015 20:01:04 +0000 (14:01 -0600)
committerSerge Hallyn <serge.hallyn@ubuntu.com>
Tue, 17 Nov 2015 20:01:04 +0000 (14:01 -0600)
It breaks container starts.

This reverts commit 473ebc77d6762c2ec49fe59983dabc04f695fd01.

src/lxc/seccomp.c

index 9eab6af9d1fc095531ff0a15cc0469dc1054bac0..02086464512825b262c88f217b64d101180840bd 100644 (file)
@@ -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) {