All of lore.kernel.org
 help / color / mirror / Atom feed
From: Konstantin Meskhidze <konstantin.meskhidze@huawei.com>
To: <mic@digikod.net>
Cc: <willemdebruijn.kernel@gmail.com>, <gnoack3000@gmail.com>,
	<linux-security-module@vger.kernel.org>, <netdev@vger.kernel.org>,
	<netfilter-devel@vger.kernel.org>, <yusongping@huawei.com>,
	<artem.kuzin@huawei.com>
Subject: [PATCH v14 09/12] selftests/landlock: Share enforce_ruleset()
Date: Thu, 26 Oct 2023 09:47:48 +0800	[thread overview]
Message-ID: <20231026014751.414649-10-konstantin.meskhidze@huawei.com> (raw)
In-Reply-To: <20231026014751.414649-1-konstantin.meskhidze@huawei.com>

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

Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze@huawei.com>
Signed-off-by: Mickaël Salaün <mic@digikod.net>
---

Changes since v13:
* Refactors commit message.

Changes since v12:
* Fixes a bug TEST_F_FORK(layout1) -> TEST_F_FORK(layout0) in fs_test.c.

Changes since v11:
* None.

Changes since v10:
* Refactors commit message.

Changes since v9:
* None.

Changes since v8:
* Adds __maybe_unused attribute for enforce_ruleset() helper.

Changes since v7:
* Refactors commit message.

Changes since v6:
* None.

Changes since v5:
* Splits commit.
* Moves enforce_ruleset helper into common.h
* Formats code with clang-format-14.

---
 tools/testing/selftests/landlock/common.h  | 10 ++++++++++
 tools/testing/selftests/landlock/fs_test.c | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/landlock/common.h b/tools/testing/selftests/landlock/common.h
index d7987ae8d7fc..0fd6c4cf5e6f 100644
--- a/tools/testing/selftests/landlock/common.h
+++ b/tools/testing/selftests/landlock/common.h
@@ -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));
+	}
+}
diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c
index 251594306d40..68b7a89cf65b 100644
--- a/tools/testing/selftests/landlock/fs_test.c
+++ b/tools/testing/selftests/landlock/fs_test.c
@@ -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[] = {
--
2.25.1


  parent reply	other threads:[~2023-10-26  1:48 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-26  1:47 [PATCH v14 00/12] Network support for Landlock Konstantin Meskhidze
2023-10-26  1:47 ` [PATCH v14 01/12] landlock: Make ruleset's access masks more generic Konstantin Meskhidze
2023-10-26  1:47 ` [PATCH v14 02/12] landlock: Allow FS topology changes for domains without such rule type Konstantin Meskhidze
2023-10-26  1:47 ` [PATCH v14 03/12] landlock: Refactor landlock_find_rule/insert_rule Konstantin Meskhidze
2023-10-26  1:47 ` [PATCH v14 04/12] landlock: Refactor merge/inherit_ruleset functions Konstantin Meskhidze
2023-10-26  1:47 ` [PATCH v14 05/12] landlock: Move and rename layer helpers Konstantin Meskhidze
2023-10-26  1:47 ` [PATCH v14 06/12] landlock: Refactor " Konstantin Meskhidze
2023-10-26  1:47 ` [PATCH v14 07/12] landlock: Refactor landlock_add_rule() syscall Konstantin Meskhidze
2023-10-26  1:47 ` [PATCH v14 08/12] landlock: Add network rules and TCP hooks support Konstantin Meskhidze
2023-10-26  1:47 ` Konstantin Meskhidze [this message]
2023-10-26  1:47 ` [PATCH v14 10/12] selftests/landlock: Add network tests Konstantin Meskhidze
2023-12-19 10:38   ` Muhammad Usama Anjum
2023-12-20  9:17     ` Mickaël Salaün
2023-12-20 11:19       ` Muhammad Usama Anjum
2024-01-11 17:06         ` Mickaël Salaün
2023-10-26  1:47 ` [PATCH v14 11/12] samples/landlock: Support TCP restrictions Konstantin Meskhidze
2023-10-26  1:47 ` [PATCH v14 12/12] landlock: Document network support Konstantin Meskhidze
2023-10-27 13:06 ` [PATCH v14 00/12] Network support for Landlock Mickaël Salaün
2023-10-28  2:07   ` Konstantin Meskhidze (A)
2023-10-27 15:46 ` [PATCH] selftests/landlock: Add tests for FS topology changes with network rules Mickaël Salaün

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231026014751.414649-10-konstantin.meskhidze@huawei.com \
    --to=konstantin.meskhidze@huawei.com \
    --cc=artem.kuzin@huawei.com \
    --cc=gnoack3000@gmail.com \
    --cc=linux-security-module@vger.kernel.org \
    --cc=mic@digikod.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=willemdebruijn.kernel@gmail.com \
    --cc=yusongping@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.