From: Sargun Dhillon <sargun@sargun.me>
To: linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org
Cc: Aleksa Sarai <cyphar@cyphar.com>, Christoph Hellwig <hch@lst.de>,
Christian Brauner <brauner@kernel.org>
Subject: [PATCH 3/3] selftests/mount_setattr: Add tests for mount locking API
Date: Thu, 10 Aug 2023 02:00:44 -0700 [thread overview]
Message-ID: <20230810090044.1252084-3-sargun@sargun.me> (raw)
In-Reply-To: <20230810090044.1252084-1-sargun@sargun.me>
This adds tests to lock specific flags in place, and verifies that
the expected rules hold.
Signed-off-by: Sargun Dhillon <sargun@sargun.me>
---
tools/include/uapi/linux/mount.h | 1 +
.../mount_setattr/mount_setattr_test.c | 42 +++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/tools/include/uapi/linux/mount.h b/tools/include/uapi/linux/mount.h
index 4d93967f8aea..66f302019373 100644
--- a/tools/include/uapi/linux/mount.h
+++ b/tools/include/uapi/linux/mount.h
@@ -135,5 +135,6 @@ struct mount_attr {
/* List of all mount_attr versions. */
#define MOUNT_ATTR_SIZE_VER0 32 /* sizeof first published struct */
+#define MOUNT_ATTR_SIZE_VER1 40
#endif /* _UAPI_LINUX_MOUNT_H */
diff --git a/tools/testing/selftests/mount_setattr/mount_setattr_test.c b/tools/testing/selftests/mount_setattr/mount_setattr_test.c
index 2aaa4aae41f5..3411fe17400b 100644
--- a/tools/testing/selftests/mount_setattr/mount_setattr_test.c
+++ b/tools/testing/selftests/mount_setattr/mount_setattr_test.c
@@ -1551,4 +1551,46 @@ TEST_F(mount_setattr, mount_attr_lock)
ASSERT_EQ(sys_mount_setattr(-1, "/tmp/C", 0, &attr, sizeof(attr)), 0);
}
+TEST_F(mount_setattr, mount_attr_do_lock)
+{
+ struct mount_attr attr = {};
+
+ attr.attr_lock = MOUNT_ATTR_NODIRATIME;
+ ASSERT_EQ(sys_mount_setattr(-1, "/tmp/C", 0, &attr, sizeof(attr)), -1);
+ ASSERT_EQ(errno, EINVAL);
+
+ attr.attr_lock = MOUNT_ATTR__ATIME;
+ ASSERT_EQ(sys_mount_setattr(-1, "/tmp/C", 0, &attr, sizeof(attr)), -1);
+ ASSERT_EQ(errno, EINVAL);
+
+ /* Do not allow locking unset locks */
+ attr.attr_lock = MOUNT_ATTR_NOEXEC;
+ ASSERT_EQ(sys_mount_setattr(-1, "/tmp/C", 0, &attr, sizeof(attr)), -1);
+ ASSERT_EQ(errno, EINVAL);
+
+ /* Set and lock at the same time */
+ attr.attr_set = MOUNT_ATTR_NOEXEC;
+ ASSERT_EQ(sys_mount_setattr(-1, "/tmp/C", 0, &attr, sizeof(attr)), 0);
+ ASSERT_EQ(errno, EINVAL);
+
+ memset(&attr, 0, sizeof(attr));
+ /* Make sure we can't clear noexec now (that locking worked) */
+ attr.attr_clr = MOUNT_ATTR_NOEXEC;
+ ASSERT_EQ(sys_mount_setattr(-1, "/tmp/C", 0, &attr, sizeof(attr)), -1);
+ ASSERT_EQ(errno, EPERM);
+
+ memset(&attr, 0, sizeof(attr));
+ attr.attr_set = MOUNT_ATTR_NODEV;
+ ASSERT_EQ(sys_mount_setattr(-1, "/tmp/C", 0, &attr, sizeof(attr)), 0);
+
+ memset(&attr, 0, sizeof(attr));
+ attr.attr_lock = MOUNT_ATTR_NODEV;
+ ASSERT_EQ(sys_mount_setattr(-1, "/tmp/C", 0, &attr, sizeof(attr)), 0);
+
+ /* Make sure we can't clear MOUNT_ATTR_NODEV */
+ memset(&attr, 0, sizeof(attr));
+ attr.attr_clr = MOUNT_ATTR_NODEV;
+ ASSERT_EQ(sys_mount_setattr(-1, "/tmp/C", 0, &attr, sizeof(attr)), -1);
+ ASSERT_EQ(errno, EPERM);
+}
TEST_HARNESS_MAIN
--
2.39.3
prev parent reply other threads:[~2023-08-10 9:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-10 9:00 [PATCH 1/3] selftests/mount_setattr: Add a test to test locking mount attrs Sargun Dhillon
2023-08-10 9:00 ` [PATCH 2/3] fs: Allow user to lock mount attributes with mount_setattr Sargun Dhillon
2023-08-14 4:40 ` Aleksa Sarai
2023-08-14 6:18 ` Aleksa Sarai
2023-08-14 18:15 ` Sargun Dhillon
2023-08-14 23:58 ` Aleksa Sarai
2023-08-15 9:30 ` Christian Brauner
2023-08-15 13:46 ` Sargun Dhillon
2023-08-16 7:32 ` Christian Brauner
2023-08-16 8:56 ` Aleksa Sarai
2023-08-16 10:36 ` Christian Brauner
2023-08-25 17:02 ` Sargun Dhillon
2023-08-10 9:00 ` Sargun Dhillon [this message]
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=20230810090044.1252084-3-sargun@sargun.me \
--to=sargun@sargun.me \
--cc=brauner@kernel.org \
--cc=cyphar@cyphar.com \
--cc=hch@lst.de \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).