From: "Mickaël Salaün" <mic@digikod.net>
To: Anton Ivanov <anton.ivanov@cambridgegreys.com>,
Johannes Berg <johannes@sipsolutions.net>,
Richard Weinberger <richard@nod.at>
Cc: "Mickaël Salaün" <mic@digikod.net>,
"Christopher Obbard" <chris.obbard@collabora.com>,
"Guenter Roeck" <groeck@chromium.org>,
"Günther Noack" <gnoack3000@gmail.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"James Morris" <jmorris@namei.org>, "Jeff Xu" <jeffxu@google.com>,
"Kees Cook" <keescook@chromium.org>,
"Paul Moore" <paul@paul-moore.com>,
"Ritesh Raj Sarraf" <ritesh@collabora.com>,
"Roberto Sassu" <roberto.sassu@huaweicloud.com>,
"Serge E . Hallyn" <serge@hallyn.com>,
"Shuah Khan" <skhan@linuxfoundation.org>,
"Sjoerd Simons" <sjoerd@collabora.com>,
"Willem de Bruijn" <willemb@google.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org,
linux-security-module@vger.kernel.org
Subject: [PATCH v2 6/6] selftests/landlock: Add hostfs tests
Date: Mon, 12 Jun 2023 21:14:30 +0200 [thread overview]
Message-ID: <20230612191430.339153-7-mic@digikod.net> (raw)
In-Reply-To: <20230612191430.339153-1-mic@digikod.net>
Add tests for the hostfs filesystems to make sure it has a consistent
inode management, which is required for Landlock's file hierarchy
identification. This adds 5 new tests for layout3_fs with the hostfs
variant.
Add hostfs to the new (architecture-specific) config.um file.
The hostfs filesystem, only available for an User-Mode Linux kernel, is
special because we cannot explicitly mount it. The layout3_fs.hostfs
variant tests are skipped if the current test directory is not backed by
this filesystem.
The layout3_fs.hostfs.tag_inode_dir_child and
layout3_fs.hostfs.tag_inode_file tests pass thanks to a previous commit
fixing hostfs inode management. Without this fix, the deny-by-default
policy would apply and all access requests would be denied.
Signed-off-by: Mickaël Salaün <mic@digikod.net>
---
tools/testing/selftests/landlock/config.um | 1 +
tools/testing/selftests/landlock/fs_test.c | 28 +++++++++++++++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/landlock/config.um
diff --git a/tools/testing/selftests/landlock/config.um b/tools/testing/selftests/landlock/config.um
new file mode 100644
index 000000000000..40937c0395d6
--- /dev/null
+++ b/tools/testing/selftests/landlock/config.um
@@ -0,0 +1 @@
+CONFIG_HOSTFS=y
diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c
index 2911b5241583..83d565569512 100644
--- a/tools/testing/selftests/landlock/fs_test.c
+++ b/tools/testing/selftests/landlock/fs_test.c
@@ -10,6 +10,7 @@
#define _GNU_SOURCE
#include <fcntl.h>
#include <linux/landlock.h>
+#include <linux/magic.h>
#include <sched.h>
#include <stdio.h>
#include <string.h>
@@ -19,6 +20,7 @@
#include <sys/sendfile.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
+#include <sys/vfs.h>
#include <unistd.h>
#include "common.h"
@@ -135,6 +137,19 @@ static bool supports_filesystem(const char *const filesystem)
return res;
}
+static bool cwd_matches_fs(unsigned int fs_magic)
+{
+ struct statfs statfs_buf;
+
+ if (!fs_magic)
+ return true;
+
+ if (statfs(".", &statfs_buf))
+ return true;
+
+ return statfs_buf.f_type == fs_magic;
+}
+
static void mkdir_parents(struct __test_metadata *const _metadata,
const char *const path)
{
@@ -4500,6 +4515,7 @@ FIXTURE_VARIANT(layout3_fs)
{
const struct mnt_opt mnt;
const char *const file_path;
+ unsigned int cwd_fs_magic;
};
/* clang-format off */
@@ -4538,13 +4554,23 @@ FIXTURE_VARIANT_ADD(layout3_fs, sysfs) {
.file_path = TMP_DIR "/kernel/notes",
};
+FIXTURE_VARIANT_ADD(layout3_fs, hostfs) {
+ .mnt = {
+ .source = TMP_DIR,
+ .flags = MS_BIND,
+ },
+ .file_path = TMP_DIR "/dir/file",
+ .cwd_fs_magic = HOSTFS_SUPER_MAGIC,
+};
+
FIXTURE_SETUP(layout3_fs)
{
struct stat statbuf;
const char *slash;
size_t dir_len;
- if (!supports_filesystem(variant->mnt.type)) {
+ if (!supports_filesystem(variant->mnt.type) ||
+ !cwd_matches_fs(variant->cwd_fs_magic)) {
self->skip_test = true;
SKIP(return, "this filesystem is not supported (setup)");
}
--
2.41.0
next prev parent reply other threads:[~2023-06-12 19:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 19:14 [PATCH v2 0/6] Landlock support for UML Mickaël Salaün
2023-06-12 19:14 ` [PATCH v2 1/6] hostfs: Fix ephemeral inodes Mickaël Salaün
2023-06-12 19:14 ` [PATCH v2 2/6] selftests/landlock: Don't create useless file layouts Mickaël Salaün
2023-06-12 19:14 ` [PATCH v2 3/6] selftests/landlock: Add supports_filesystem() helper Mickaël Salaün
2023-06-12 19:14 ` [PATCH v2 4/6] selftests/landlock: Make mounts configurable Mickaël Salaün
2023-06-12 19:14 ` [PATCH v2 5/6] selftests/landlock: Add tests for pseudo filesystems Mickaël Salaün
2023-06-12 19:14 ` Mickaël Salaün [this message]
2023-06-12 19:31 ` [PATCH v2 0/6] Landlock support for UML 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=20230612191430.339153-7-mic@digikod.net \
--to=mic@digikod.net \
--cc=anton.ivanov@cambridgegreys.com \
--cc=chris.obbard@collabora.com \
--cc=gnoack3000@gmail.com \
--cc=groeck@chromium.org \
--cc=jeffxu@google.com \
--cc=jmorris@namei.org \
--cc=johannes@sipsolutions.net \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=richard@nod.at \
--cc=ritesh@collabora.com \
--cc=roberto.sassu@huaweicloud.com \
--cc=serge@hallyn.com \
--cc=sjoerd@collabora.com \
--cc=skhan@linuxfoundation.org \
--cc=willemb@google.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox