p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

selftests/seccomp: Get page size from sysconf 

The commit fd88d16c58 ("selftests/seccomp: Be more precise with
syscall arguments.") use PAGE_SIZE directly which lead to build
failure on arm64.

Replace it with generic interface(sysconf(_SC_PAGESIZE)) to fix this
failure.

Build and test successful on x86_64 and arm64.

Signed-off-by: Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
Acked-by: Kees Cook <keescook@chromium.org>
Tested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
This commit is contained in:
Bamvor Jian Zhang 2015-11-13 11:17:51 +08:00 committed by Shuah Khan
parent 9e5b8a6e53
commit 2ce47b44b2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/testing/selftests/seccomp/seccomp_bpf.c
View File

@ -492,6 +492,9 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS)
pid_t parent = getppid(); pid_t parent = getppid();
int fd; int fd;
void *map1, *map2; void *map1, *map2;
int page_size = sysconf(_SC_PAGESIZE);
ASSERT_LT(0, page_size);
ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0);
ASSERT_EQ(0, ret); ASSERT_EQ(0, ret);
@ -504,16 +507,16 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS)
EXPECT_EQ(parent, syscall(__NR_getppid)); EXPECT_EQ(parent, syscall(__NR_getppid));
map1 = (void *)syscall(sysno, map1 = (void *)syscall(sysno,
NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE, fd, PAGE_SIZE); NULL, page_size, PROT_READ, MAP_PRIVATE, fd, page_size);
EXPECT_NE(MAP_FAILED, map1); EXPECT_NE(MAP_FAILED, map1);
/* mmap2() should never return. */ /* mmap2() should never return. */
map2 = (void *)syscall(sysno, map2 = (void *)syscall(sysno,
NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE, fd, 0x0C0FFEE); NULL, page_size, PROT_READ, MAP_PRIVATE, fd, 0x0C0FFEE);
EXPECT_EQ(MAP_FAILED, map2); EXPECT_EQ(MAP_FAILED, map2);
/* The test failed, so clean up the resources. */ /* The test failed, so clean up the resources. */
munmap(map1, PAGE_SIZE); munmap(map1, page_size);
munmap(map2, PAGE_SIZE); munmap(map2, page_size);
close(fd); close(fd);
} }