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

Commit 6c3b6d50 authored by Kees Cook's avatar Kees Cook Committed by Shuah Khan
Browse files

selftests/seccomp: Allow get_metadata to XFAIL 



Since seccomp_get_metadata() depends on CHECKPOINT_RESTORE, XFAIL the
test if the ptrace reports it as missing.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarTycho Andersen <tycho@tycho.ws>
Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
parent 55c1b5f4

tools/testing/selftests/kselftest_harness.h

+25 −1
Original line number Diff line number Diff line
@@ -106,6 +106,27 @@ 
		fprintf(TH_LOG_STREAM, "%s:%d:%s:" fmt "\n", \

			__FILE__, __LINE__, _metadata->name, ##__VA_ARGS__)



/**

 * XFAIL(statement, fmt, ...)

 *

 * @statement: statement to run after reporting XFAIL

 * @fmt: format string

 * @...: optional arguments

 *

 * This forces a "pass" after reporting a failure with an XFAIL prefix,

 * and runs "statement", which is usually "return" or "goto skip".

 */

#define XFAIL(statement, fmt, ...) do { \

	if (TH_LOG_ENABLED) { \

		fprintf(TH_LOG_STREAM, "[  XFAIL!  ] " fmt "\n", \

			##__VA_ARGS__); \

	} \

	/* TODO: find a way to pass xfail to test runner process. */ \

	_metadata->passed = 1; \

	_metadata->trigger = 0; \

	statement; \

} while (0)



/**

 * TEST(test_name) - Defines the test function and creates the registration

 * stub
@@ -198,7 +219,7 @@ 


/**

 * FIXTURE_SETUP(fixture_name) - Prepares the setup function for the fixture.

 * *_metadata* is included so that ASSERT_* work as a convenience

 * *_metadata* is included so that EXPECT_* and ASSERT_* work correctly.

 *

 * @fixture_name: fixture name

 *
@@ -221,6 +242,7 @@ 
		FIXTURE_DATA(fixture_name) __attribute__((unused)) *self)

/**

 * FIXTURE_TEARDOWN(fixture_name)

 * *_metadata* is included so that EXPECT_* and ASSERT_* work correctly.

 *

 * @fixture_name: fixture name

 *
@@ -253,6 +275,8 @@ 
 * Defines a test that depends on a fixture (e.g., is part of a test case).

 * Very similar to TEST() except that *self* is the setup instance of fixture's

 * datatype exposed for use by the implementation.

 *

 * Warning: use of ASSERT_* here will skip TEARDOWN.

 */

/* TODO(wad) register fixtures on dedicated test lists. */

#define TEST_F(fixture_name, test_name) \

tools/testing/selftests/seccomp/seccomp_bpf.c

+13 −2
Original line number Diff line number Diff line
@@ -2860,6 +2860,7 @@ TEST(get_metadata) 
	int pipefd[2];

	char buf;

	struct seccomp_metadata md;

	long ret;



	ASSERT_EQ(0, pipe(pipefd));
@@ -2893,16 +2894,26 @@ TEST(get_metadata) 
	ASSERT_EQ(0, ptrace(PTRACE_ATTACH, pid));

	ASSERT_EQ(pid, waitpid(pid, NULL, 0));



	/* Past here must not use ASSERT or child process is never killed. */



	md.filter_off = 0;

	ASSERT_EQ(sizeof(md), ptrace(PTRACE_SECCOMP_GET_METADATA, pid, sizeof(md), &md));

	errno = 0;

	ret = ptrace(PTRACE_SECCOMP_GET_METADATA, pid, sizeof(md), &md);

	EXPECT_EQ(sizeof(md), ret) {

		if (errno == EINVAL)

			XFAIL(goto skip, "Kernel does not support PTRACE_SECCOMP_GET_METADATA (missing CONFIG_CHECKPOINT_RESTORE?)");

	}



	EXPECT_EQ(md.flags, SECCOMP_FILTER_FLAG_LOG);

	EXPECT_EQ(md.filter_off, 0);



	md.filter_off = 1;

	ASSERT_EQ(sizeof(md), ptrace(PTRACE_SECCOMP_GET_METADATA, pid, sizeof(md), &md));

	ret = ptrace(PTRACE_SECCOMP_GET_METADATA, pid, sizeof(md), &md);

	EXPECT_EQ(sizeof(md), ret);

	EXPECT_EQ(md.flags, 0);

	EXPECT_EQ(md.filter_off, 1);



skip:

	ASSERT_EQ(0, kill(pid, SIGKILL));

}