From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 20 Oct 2016 20:35:36 +0000 (-0400)
Subject: s390x: Fix seccomp handling of personalities
X-Git-Tag: lxc-1.0.9~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afc54276bbedf897103e080c9b7f4ceda2a1fe6d;p=thirdparty%2Flxc.git

s390x: Fix seccomp handling of personalities

There are no personalities for s390x, so don't list itself as one.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index 5069730d6..83b1cb472 100644
--- a/src/lxc/seccomp.c
+++ b/src/lxc/seccomp.c
@@ -377,15 +377,6 @@ static int parse_config_v2(FILE *f, char *line, struct lxc_conf *conf)
 				default_policy_action);
 		if (!compat_ctx[0] || !compat_ctx[1])
 			goto bad;
-#endif
-#ifdef SCMP_ARCH_S390X
-	} else if (native_arch == lxc_seccomp_arch_s390x) {
-		cur_rule_arch = lxc_seccomp_arch_all;
-		compat_arch[0] = SCMP_ARCH_S390X;
-		compat_ctx[0] = get_new_ctx(lxc_seccomp_arch_s390x,
-				default_policy_action);
-		if (!compat_ctx[0])
-			goto bad;
 #endif
 	}