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

Commit a2931547 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.4-rc3' of... 

Merge tag 'linux-kselftest-4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "This update consists of one minor documentation fix and a fix to an
  existing test"

* tag 'linux-kselftest-4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/seccomp: Get page size from sysconf
  tools:testing/selftests: fix typo in futex/README
parents 1ec21837 2ce47b44

tools/testing/selftests/futex/README

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ o The build system shall remain as simple as possible, avoiding any archive or 
o Where possible, any helper functions or other package-wide code shall be

  implemented in header files, avoiding the need to compile intermediate object

  files.

o External dependendencies shall remain as minimal as possible. Currently gcc

o External dependencies shall remain as minimal as possible. Currently gcc

  and glibc are the only dependencies.

o Tests return 0 for success and < 0 for failure.

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

}