diff options
author | netblue30 <netblue30@yahoo.com> | 2018-05-20 08:52:47 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2018-05-20 08:52:47 -0400 |
commit | 9d549aaff9667772501f69dc1327123229ee91f1 (patch) | |
tree | 6fa560884639dfa82d1d4627edc0a7ac587da8c1 /src/fseccomp | |
parent | Fixup xplayer (diff) | |
download | firejail-9d549aaff9667772501f69dc1327123229ee91f1.tar.gz firejail-9d549aaff9667772501f69dc1327123229ee91f1.tar.zst firejail-9d549aaff9667772501f69dc1327123229ee91f1.zip |
reverted commit 5a3eefa6e70e824f545add9169202f788a9ce14d, issue #1948
Diffstat (limited to 'src/fseccomp')
-rw-r--r-- | src/fseccomp/seccomp.c | 5 |
1 files changed, 0 insertions, 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) { | |||
242 | 242 | ||
243 | // same for pkey_mprotect(,,PROT_EXEC), where available | 243 | // same for pkey_mprotect(,,PROT_EXEC), where available |
244 | #ifdef SYS_pkey_mprotect | 244 | #ifdef SYS_pkey_mprotect |
245 | #ifdef __NR_pkey_mprotect | ||
246 | // RasPi 2 (kernel 4.14.37) seems to have SYS_pkey_mprotect #defined as __NR_pkey_mprotect | ||
247 | // but no __NR_pkey_mprotect defined? | ||
248 | // issue #1948 | ||
249 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_pkey_mprotect, 0, 5), | 245 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_pkey_mprotect, 0, 5), |
250 | EXAMINE_ARGUMENT(2), | 246 | EXAMINE_ARGUMENT(2), |
251 | BPF_STMT(BPF_ALU+BPF_AND+BPF_K, PROT_EXEC), | 247 | BPF_STMT(BPF_ALU+BPF_AND+BPF_K, PROT_EXEC), |
@@ -253,7 +249,6 @@ void memory_deny_write_execute(const char *fname) { | |||
253 | KILL_PROCESS, | 249 | KILL_PROCESS, |
254 | RETURN_ALLOW, | 250 | RETURN_ALLOW, |
255 | #endif | 251 | #endif |
256 | #endif | ||
257 | 252 | ||
258 | // shmat is not implemented as a syscall on some platforms (i386, powerpc64, powerpc64le) | 253 | // shmat is not implemented as a syscall on some platforms (i386, powerpc64, powerpc64le) |
259 | #ifdef SYS_shmat | 254 | #ifdef SYS_shmat |