From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Tue, 17 Nov 2015 20:01:04 +0000 (-0600)
Subject: Revert "seccomp: handle inverted arch"
X-Git-Tag: lxc-1.0.9~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2e1ec0a080c32e1c2cce69b556d89b9ce2027d1;p=thirdparty%2Flxc.git

Revert "seccomp: handle inverted arch"

It breaks container starts.

This reverts commit 473ebc77d6762c2ec49fe59983dabc04f695fd01.
---

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) {