diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c index e08480230e..13c83097a5 100644 --- a/src/shared/seccomp-util.c +++ b/src/shared/seccomp-util.c @@ -1427,11 +1427,11 @@ static int add_seccomp_syscall_filter(scmp_filter_ctx seccomp, } /* For known architectures, check that syscalls are indeed defined or not. */ -#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || (defined(__mips__) && defined(__mips64)) +#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) assert_cc(SCMP_SYS(shmget) > 0); assert_cc(SCMP_SYS(shmat) > 0); assert_cc(SCMP_SYS(shmdt) > 0); -#elif defined(__i386__) || defined(__powerpc64__) || (defined(__mips__) && !defined(__mips64)) +#elif defined(__i386__) || defined(__powerpc64__) assert_cc(SCMP_SYS(shmget) < 0); assert_cc(SCMP_SYS(shmat) < 0); assert_cc(SCMP_SYS(shmdt) < 0); @@ -1451,8 +1451,6 @@ int seccomp_memory_deny_write_execute(void) { switch (arch) { case SCMP_ARCH_X86: - case SCMP_ARCH_MIPSEL: - case SCMP_ARCH_MIPS: filter_syscall = SCMP_SYS(mmap2); block_syscall = SCMP_SYS(mmap); break; @@ -1476,17 +1474,13 @@ int seccomp_memory_deny_write_execute(void) { case SCMP_ARCH_X86_64: case SCMP_ARCH_X32: case SCMP_ARCH_AARCH64: - case SCMP_ARCH_MIPSEL64N32: - case SCMP_ARCH_MIPS64N32: - case SCMP_ARCH_MIPSEL64: - case SCMP_ARCH_MIPS64: - filter_syscall = SCMP_SYS(mmap); /* amd64, x32, arm64 and mips64 have only mmap */ + filter_syscall = SCMP_SYS(mmap); /* amd64, x32, and arm64 have only mmap */ shmat_syscall = SCMP_SYS(shmat); break; /* Please add more definitions here, if you port systemd to other architectures! */ -#if !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) && !defined(__powerpc64__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) +#if !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) && !defined(__powerpc64__) && !defined(__arm__) && !defined(__aarch64__) #warning "Consider adding the right mmap() syscall definitions here!" #endif }