Skip to content

Commit 2ce47b4

Browse files
Bamvor Jian ZhangShuah Khan
authored andcommitted
selftests/seccomp: Get page size from sysconf
The commit fd88d16 ("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>
1 parent 9e5b8a6 commit 2ce47b4

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

tools/testing/selftests/seccomp/seccomp_bpf.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,9 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS)
492492
pid_t parent = getppid();
493493
int fd;
494494
void *map1, *map2;
495+
int page_size = sysconf(_SC_PAGESIZE);
496+
497+
ASSERT_LT(0, page_size);
495498

496499
ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0);
497500
ASSERT_EQ(0, ret);
@@ -504,16 +507,16 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS)
504507

505508
EXPECT_EQ(parent, syscall(__NR_getppid));
506509
map1 = (void *)syscall(sysno,
507-
NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE, fd, PAGE_SIZE);
510+
NULL, page_size, PROT_READ, MAP_PRIVATE, fd, page_size);
508511
EXPECT_NE(MAP_FAILED, map1);
509512
/* mmap2() should never return. */
510513
map2 = (void *)syscall(sysno,
511-
NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE, fd, 0x0C0FFEE);
514+
NULL, page_size, PROT_READ, MAP_PRIVATE, fd, 0x0C0FFEE);
512515
EXPECT_EQ(MAP_FAILED, map2);
513516

514517
/* The test failed, so clean up the resources. */
515-
munmap(map1, PAGE_SIZE);
516-
munmap(map2, PAGE_SIZE);
518+
munmap(map1, page_size);
519+
munmap(map2, page_size);
517520
close(fd);
518521
}
519522

0 commit comments

Comments
 (0)