From: Christian Brauner <brauner@kernel.org>
To: linux-fsdevel@vger.kernel.org
Cc: Alexander Viro <viro@zeniv.linux.org.uk>, Jan Kara <jack@suse.cz>,
Miklos Szeredi <mszeredi@redhat.com>,
Jeff Layton <jlayton@kernel.org>, shaos <shawnq1@163.com>,
linux-kernel@vger.kernel.org,
"Christian Brauner (Amutable)" <brauner@kernel.org>
Subject: [PATCH 2/6] selftests/filesystems: check short buffers for statmount() strings
Date: Wed, 21 Oct 2026 13:46:55 +0200 [thread overview]
Message-ID: <20261021-work-mount-statmount_listns_fixes-v1-2-8917a4c1bd14@kernel.org> (raw)
In-Reply-To: <20261021-work-mount-statmount_listns_fixes-v1-0-8917a4c1bd14@kernel.org>
Request strings that end up empty with buffers that aren't larger than
the fixed part of struct statmount and check that:
- every request fails with EOVERFLOW
- nothing is written past the end of the buffer, a guard page right
behind it catches that
The buffer sizes run from zero up to sizeof(struct statmount) and the
requests cover STATMOUNT_FS_TYPE, STATMOUNT_FS_SUBTYPE and
STATMOUNT_MNT_UIDMAP.
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
---
.../filesystems/statmount/statmount_test.c | 61 +++++++++++++++++++++-
1 file changed, 60 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/filesystems/statmount/statmount_test.c b/tools/testing/selftests/filesystems/statmount/statmount_test.c
index 60c2c544db6a..2947546a9367 100644
--- a/tools/testing/selftests/filesystems/statmount/statmount_test.c
+++ b/tools/testing/selftests/filesystems/statmount/statmount_test.c
@@ -7,6 +7,7 @@
#include <sched.h>
#include <fcntl.h>
#include <sys/param.h>
+#include <sys/mman.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/statfs.h>
@@ -578,6 +579,63 @@ static void test_statmount_string(uint64_t mask, size_t off, const char *name)
free(sm);
}
+/*
+ * A string request needs a buffer that is larger than the fixed part of
+ * struct statmount. That's true even if the string turns out to be empty
+ * since the empty string itself is placed past the fixed part.
+ */
+static void test_statmount_string_short_buffer(void)
+{
+ const struct {
+ uint64_t mask;
+ const char *name;
+ } reqs[] = {
+ { STATMOUNT_FS_TYPE, "fs type" },
+ { STATMOUNT_FS_SUBTYPE, "fs subtype" },
+ { STATMOUNT_MNT_UIDMAP, "mount uidmap" },
+ };
+ const size_t sizes[] = { 0, 1, 100, sizeof(struct statmount) - 1,
+ sizeof(struct statmount) };
+ long page = sysconf(_SC_PAGESIZE);
+ unsigned char *map;
+ size_t i, j;
+ int ret;
+
+ map = mmap(NULL, 2 * page, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ if (map == MAP_FAILED) {
+ ksft_test_result_fail("mmap: %s\n", strerror(errno));
+ return;
+ }
+
+ /* Anything written past the end of the buffer faults. */
+ if (mprotect(map + page, page, PROT_NONE)) {
+ ksft_test_result_fail("mprotect: %s\n", strerror(errno));
+ goto out;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(reqs); i++) {
+ for (j = 0; j < ARRAY_SIZE(sizes); j++) {
+ /* The buffer ends right at the guard page. */
+ struct statmount *sm = (void *)(map + page - sizes[j]);
+
+ errno = 0;
+ ret = statmount(root_id, 0, 0, reqs[i].mask, sm,
+ sizes[j], 0);
+ if (ret != -1 || errno != EOVERFLOW) {
+ ksft_test_result_fail("statmount %s with %zu byte buffer: %s\n",
+ reqs[i].name, sizes[j],
+ ret ? strerror(errno) : "success");
+ goto out;
+ }
+ }
+ }
+
+ ksft_test_result_pass("statmount string short buffer\n");
+out:
+ munmap(map, 2 * page);
+}
+
static void test_listmount_tree(void)
{
ssize_t res;
@@ -869,7 +927,7 @@ int main(void)
setup_namespace();
- ksft_set_plan(17);
+ ksft_set_plan(18);
test_listmount_empty_root();
test_statmount_zero_mask();
test_statmount_mnt_basic();
@@ -884,6 +942,7 @@ int main(void)
test_statmount_string(all_mask, str_off(mnt_root), "mount root & all");
test_statmount_string(all_mask, str_off(mnt_point), "mount point & all");
test_statmount_string(all_mask, str_off(fs_type), "fs type & all");
+ test_statmount_string_short_buffer();
test_listmount_tree();
test_statmount_by_fd_unmounted();
--
2.53.0
next prev parent reply other threads:[~2026-10-21 11:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-21 11:46 [PATCH 0/6] fs: fixes for statmount() short buffers and listmount()/listns() cursors Christian Brauner
2026-10-21 11:46 ` [PATCH 1/6] statmount: don't copy the reserved empty string past the buffer Christian Brauner
2026-10-21 11:52 ` Jeff Layton
2026-10-21 15:18 ` Jan Kara
2026-10-21 11:46 ` Christian Brauner [this message]
2026-10-21 11:46 ` [PATCH 3/6] listmount: don't wrap around with a U64_MAX cursor Christian Brauner
2026-10-21 11:52 ` Jeff Layton
2026-10-21 15:25 ` Jan Kara
2026-10-21 11:46 ` [PATCH 4/6] selftests/filesystems: check listmount() " Christian Brauner
2026-10-21 11:46 ` [PATCH 5/6] listns: don't wrap around " Christian Brauner
2026-10-21 11:55 ` Jeff Layton
2026-10-21 15:29 ` Jan Kara
2026-10-21 11:46 ` [PATCH 6/6] selftests/namespaces: check listns() " Christian Brauner
2026-10-21 13:18 ` [PATCH 0/6] fs: fixes for statmount() short buffers and listmount()/listns() cursors Christian Brauner
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=20261021-work-mount-statmount_listns_fixes-v1-2-8917a4c1bd14@kernel.org \
--to=brauner@kernel.org \
--cc=jack@suse.cz \
--cc=jlayton@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mszeredi@redhat.com \
--cc=shawnq1@163.com \
--cc=viro@zeniv.linux.org.uk \
/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
all inboxes | Powered by JetHome®