diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-05-04 16:09:53 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-05-08 00:59:37 +0200 |
| commit | 2a65bd94e44f121a27afd39fdde6b462394c3e59 (patch) | |
| tree | 887d4d4620a8ae018c046da191a7b92fcd1e3c53 /src/shared/seccomp-util.h | |
| parent | test-seccomp: limit the code under #ifdef (diff) | |
| download | systemd-2a65bd94e44f121a27afd39fdde6b462394c3e59.tar.xz systemd-2a65bd94e44f121a27afd39fdde6b462394c3e59.zip | |
seccomp: drop SECCOMP_MEMORY_DENY_WRITE_EXECUTE_BROKEN, add test for shmat
SECCOMP_MEMORY_DENY_WRITE_EXECUTE_BROKEN was conflating two separate things:
1. whether shmat/shmdt/shmget can be filtered (if ipc multiplexer is used, they can not)
2. whether we know this for the current architecture
For i386, shmat is implemented as ipc, so seccomp filter is "broken" for shmat,
but not for mmap, and SECCOMP_MEMORY_DENY_WRITE_EXECUTE_BROKEN cannot be used
to cover both cases. The define was only used for tests — not in the implementation
in seccomp-util.c. So let's get rid of SECCOMP_MEMORY_DENY_WRITE_EXECUTE_BROKEN
and encode the right condition directly in tests.
Diffstat (limited to 'src/shared/seccomp-util.h')
| -rw-r--r-- | src/shared/seccomp-util.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/shared/seccomp-util.h b/src/shared/seccomp-util.h index 468be19f05..7eeab29c3b 100644 --- a/src/shared/seccomp-util.h +++ b/src/shared/seccomp-util.h @@ -84,13 +84,6 @@ int seccomp_memory_deny_write_execute(void); #define SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN 0 #endif -/* mmap() blocking is only available on some archs for now */ -#if defined(__x86_64__) || defined(__i386__) -#define SECCOMP_MEMORY_DENY_WRITE_EXECUTE_BROKEN 0 -#else -#define SECCOMP_MEMORY_DENY_WRITE_EXECUTE_BROKEN 1 -#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__) || defined(__powerpc64__) || defined(__mips__) #define SECCOMP_RESTRICT_NAMESPACES_BROKEN 0 |