shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 19:21:53 +03:00
Code

test-seccomp: limit the code under #ifdef

Browse Source 
Try to make the paths for supported and unsupported architectures as
similar as possible.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-05-03 19:50:19 +00:00
parent a3645cc6dd
commit dce0e62046
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/test/test-seccomp.c
View File

@ -286,12 +286,12 @@ static void test_restrict_address_families(void) {
assert_se(fd >= 0); assert_se(fd >= 0);
safe_close(fd); safe_close(fd);
#if SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN
fd = socket(AF_UNIX, SOCK_DGRAM, 0); fd = socket(AF_UNIX, SOCK_DGRAM, 0);
#if SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN
assert_se(fd >= 0); assert_se(fd >= 0);
safe_close(fd); safe_close(fd);
#else #else
assert_se(socket(AF_UNIX, SOCK_DGRAM, 0) < 0); assert_se(fd < 0);
assert_se(errno == EAFNOSUPPORT); assert_se(errno == EAFNOSUPPORT);
#endif #endif
@ -309,19 +309,21 @@ static void test_restrict_address_families(void) {
assert_se(fd >= 0); assert_se(fd >= 0);
safe_close(fd); safe_close(fd);
#if SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN
fd = socket(AF_UNIX, SOCK_DGRAM, 0); fd = socket(AF_UNIX, SOCK_DGRAM, 0);
assert_se(fd >= 0); #if SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN
safe_close(fd);
fd = socket(AF_NETLINK, SOCK_DGRAM, 0);
assert_se(fd >= 0); assert_se(fd >= 0);
safe_close(fd); safe_close(fd);
#else #else
assert_se(socket(AF_UNIX, SOCK_DGRAM, 0) < 0); assert_se(fd < 0);
assert_se(errno == EAFNOSUPPORT); assert_se(errno == EAFNOSUPPORT);
#endif
assert_se(socket(AF_NETLINK, SOCK_DGRAM, 0) < 0); fd = socket(AF_NETLINK, SOCK_DGRAM, 0);
#if SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN
assert_se(fd >= 0);
safe_close(fd);
#else
assert_se(fd < 0);
assert_se(errno == EAFNOSUPPORT); assert_se(errno == EAFNOSUPPORT);
#endif #endif
@ -393,12 +395,11 @@ static void test_memory_deny_write_execute(void) {
assert_se(seccomp_memory_deny_write_execute() >= 0); assert_se(seccomp_memory_deny_write_execute() >= 0);
#if SECCOMP_MEMORY_DENY_WRITE_EXECUTE_BROKEN
p = mmap(NULL, page_size(), PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1,0); p = mmap(NULL, page_size(), PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1,0);
#if SECCOMP_MEMORY_DENY_WRITE_EXECUTE_BROKEN
assert_se(p != MAP_FAILED); assert_se(p != MAP_FAILED);
assert_se(munmap(p, page_size()) >= 0); assert_se(munmap(p, page_size()) >= 0);
#else #else
p = mmap(NULL, page_size(), PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1,0);
assert_se(p == MAP_FAILED); assert_se(p == MAP_FAILED);
assert_se(errno == EPERM); assert_se(errno == EPERM);
#endif #endif