From 9d549aaff9667772501f69dc1327123229ee91f1 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 20 May 2018 08:52:47 -0400 Subject: reverted commit 5a3eefa6e70e824f545add9169202f788a9ce14d, issue #1948 --- src/fseccomp/seccomp.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/fseccomp/seccomp.c b/src/fseccomp/seccomp.c index 0ecf708ce..777c38c43 100644 --- a/src/fseccomp/seccomp.c +++ b/src/fseccomp/seccomp.c @@ -242,10 +242,6 @@ void memory_deny_write_execute(const char *fname) { // same for pkey_mprotect(,,PROT_EXEC), where available #ifdef SYS_pkey_mprotect -#ifdef __NR_pkey_mprotect -// RasPi 2 (kernel 4.14.37) seems to have SYS_pkey_mprotect #defined as __NR_pkey_mprotect -// but no __NR_pkey_mprotect defined? -// issue #1948 BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_pkey_mprotect, 0, 5), EXAMINE_ARGUMENT(2), BPF_STMT(BPF_ALU+BPF_AND+BPF_K, PROT_EXEC), @@ -253,7 +249,6 @@ void memory_deny_write_execute(const char *fname) { KILL_PROCESS, RETURN_ALLOW, #endif -#endif // shmat is not implemented as a syscall on some platforms (i386, powerpc64, powerpc64le) #ifdef SYS_shmat -- cgit v1.2.3-54-g00ecf