summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-14 05:27:40 -0500
committerLennart Poettering <lennart@poettering.net>2017-02-14 11:27:40 +0100
commit290f0ff9aa4fa184de6810344415959e0b466cdb (patch)
tree1d5098cbed212916d135a6c42a5f9e68ace73456
parent36971ed37bb638e9228c1fb99d6f0e8dceee7855 (diff)
Define clone order on ppc (#5325)
This was tested on ppc64le. Assume the same is true for ppc64.
-rw-r--r--src/shared/seccomp-util.c6
-rw-r--r--src/shared/seccomp-util.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index 84964f750f..2631856563 100644
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -802,6 +802,8 @@ int seccomp_restrict_namespaces(unsigned long retain) {
case SCMP_ARCH_X86_64:
case SCMP_ARCH_X86:
case SCMP_ARCH_X32:
+ case SCMP_ARCH_PPC64:
+ case SCMP_ARCH_PPC64LE:
clone_reversed_order = 0;
break;
@@ -813,8 +815,8 @@ int seccomp_restrict_namespaces(unsigned long retain) {
/* Please add more definitions here, if you port systemd to other architectures! */
-#if !defined(__i386__) && !defined(__x86_64__) && !defined(__s390__) && !defined(__s390x__)
-#warning "Consider adding the right clone() syscall definitions here!"
+#if SECCOMP_RESTRICT_NAMESPACES_BROKEN
+# warning "Consider adding the right clone() syscall definitions here!"
#endif
}
diff --git a/src/shared/seccomp-util.h b/src/shared/seccomp-util.h
index 61f94de638..b56ac3f763 100644
--- a/src/shared/seccomp-util.h
+++ b/src/shared/seccomp-util.h
@@ -92,7 +92,7 @@ int seccomp_memory_deny_write_execute(void);
#endif
/* we don't know the right order of the clone() parameters except for these archs, for now */
-#if defined(__x86_64__) || defined(__i386__) || defined(__s390x__) || defined(__s390__)
+#if defined(__x86_64__) || defined(__i386__) || defined(__s390x__) || defined(__s390__) || defined(__powerpc64__)
#define SECCOMP_RESTRICT_NAMESPACES_BROKEN 0
#else
#define SECCOMP_RESTRICT_NAMESPACES_BROKEN 1