From dce0e62046015a5128d7ae559a9b8595c9a62af4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 3 May 2017 19:50:19 +0000 Subject: [PATCH] test-seccomp: limit the code under #ifdef Try to make the paths for supported and unsupported architectures as similar as possible. --- src/test/test-seccomp.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c index 34a1275..75dfed4 100644 --- a/src/test/test-seccomp.c +++ b/src/test/test-seccomp.c @@ -286,12 +286,12 @@ static void test_restrict_address_families(void) { assert_se(fd >= 0); safe_close(fd); -#if SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN fd = socket(AF_UNIX, SOCK_DGRAM, 0); +#if SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN assert_se(fd >= 0); safe_close(fd); #else - assert_se(socket(AF_UNIX, SOCK_DGRAM, 0) < 0); + assert_se(fd < 0); assert_se(errno == EAFNOSUPPORT); #endif @@ -309,19 +309,21 @@ static void test_restrict_address_families(void) { assert_se(fd >= 0); safe_close(fd); -#if SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN fd = socket(AF_UNIX, 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); +#endif fd = socket(AF_NETLINK, SOCK_DGRAM, 0); +#if SECCOMP_RESTRICT_ADDRESS_FAMILIES_BROKEN assert_se(fd >= 0); safe_close(fd); #else - assert_se(socket(AF_UNIX, SOCK_DGRAM, 0) < 0); - assert_se(errno == EAFNOSUPPORT); - - assert_se(socket(AF_NETLINK, SOCK_DGRAM, 0) < 0); + assert_se(fd < 0); assert_se(errno == EAFNOSUPPORT); #endif @@ -393,12 +395,11 @@ static void test_memory_deny_write_execute(void) { 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); +#if SECCOMP_MEMORY_DENY_WRITE_EXECUTE_BROKEN assert_se(p != MAP_FAILED); assert_se(munmap(p, page_size()) >= 0); #else - p = mmap(NULL, page_size(), PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1,0); assert_se(p == MAP_FAILED); assert_se(errno == EPERM); #endif -- 2.7.4