Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ce47b44 authored by Bamvor Jian Zhang's avatar Bamvor Jian Zhang Committed by Shuah Khan
Browse files

selftests/seccomp: Get page size from sysconf 



The commit fd88d16c ("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: default avatarBamvor Jian Zhang <bamvor.zhangjian@linaro.org>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
parent 9e5b8a6e

tools/testing/selftests/seccomp/seccomp_bpf.c

+7 −4
Original line number Diff line number Diff line
@@ -492,6 +492,9 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS) 
	pid_t parent = getppid();

	int fd;

	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);

	ASSERT_EQ(0, ret);
@@ -504,16 +507,16 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS) 


	EXPECT_EQ(parent, syscall(__NR_getppid));

	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);

	/* mmap2() should never return. */

	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);



	/* The test failed, so clean up the resources. */

	munmap(map1, PAGE_SIZE);

	munmap(map2, PAGE_SIZE);

	munmap(map1, page_size);

	munmap(map2, page_size);

	close(fd);

}