Unverified Commit 1fa33520 authored by Konstantin Meskhidze's avatar Konstantin Meskhidze Committed by Mickaël Salaün
Browse files

selftests/landlock: Share enforce_ruleset() helper 



Move enforce_ruleset() helper function to common.h so that it can be
used both by filesystem tests and network ones.

Signed-off-by: default avatarKonstantin Meskhidze <konstantin.meskhidze@huawei.com>
Link: https://lore.kernel.org/r/20231026014751.414649-10-konstantin.meskhidze@huawei.com


Signed-off-by: default avatarMickaël Salaün <mic@digikod.net>
parent fff69fb0

tools/testing/selftests/landlock/common.h

+10 −0
Original line number Diff line number Diff line
@@ -256,3 +256,13 @@ static int __maybe_unused send_fd(int usock, int fd_tx) 
		return -errno;

	return 0;

}



static void __maybe_unused

enforce_ruleset(struct __test_metadata *const _metadata, const int ruleset_fd)

{

	ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0));

	ASSERT_EQ(0, landlock_restrict_self(ruleset_fd, 0))

	{

		TH_LOG("Failed to enforce ruleset: %s", strerror(errno));

	}

}

tools/testing/selftests/landlock/fs_test.c

+0 −10
Original line number Diff line number Diff line
@@ -677,16 +677,6 @@ static int create_ruleset(struct __test_metadata *const _metadata, 
	return ruleset_fd;

}



static void enforce_ruleset(struct __test_metadata *const _metadata,

			    const int ruleset_fd)

{

	ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0));

	ASSERT_EQ(0, landlock_restrict_self(ruleset_fd, 0))

	{

		TH_LOG("Failed to enforce ruleset: %s", strerror(errno));

	}

}



TEST_F_FORK(layout0, proc_nsfs)

{

	const struct rule rules[] = {