[LTP] [PATCH] syscalls/mount_setattr01: Add basic functional test
Dai Shili
daisl.fnst@fujitsu.com
Thu Mar 10 21:19:42 CET 2022
The mount_setattr() system call changes the mount properties of
a mount or an entire mount tree. Here we check whether the mount
attributes are set and cleared correctly.
Signed-off-by: Dai Shili <daisl.fnst@fujitsu.com>
---
include/lapi/fsmount.h | 29 ++++++
runtest/syscalls | 2 +
testcases/kernel/syscalls/mount_setattr/.gitignore | 1 +
testcases/kernel/syscalls/mount_setattr/Makefile | 6 ++
.../syscalls/mount_setattr/mount_setattr01.c | 104 +++++++++++++++++++++
5 files changed, 142 insertions(+)
create mode 100644 testcases/kernel/syscalls/mount_setattr/.gitignore
create mode 100644 testcases/kernel/syscalls/mount_setattr/Makefile
create mode 100644 testcases/kernel/syscalls/mount_setattr/mount_setattr01.c
diff --git a/include/lapi/fsmount.h b/include/lapi/fsmount.h
index fa25306..99d0a0a 100644
--- a/include/lapi/fsmount.h
+++ b/include/lapi/fsmount.h
@@ -15,6 +15,26 @@
#include "lapi/fcntl.h"
#include "lapi/syscalls.h"
+/*
+ * Mount attributes.
+ */
+#define MOUNT_ATTR_RDONLY 0x00000001 /* Mount read-only */
+#define MOUNT_ATTR_NOSUID 0x00000002 /* Ignore suid and sgid bits */
+#define MOUNT_ATTR_NODEV 0x00000004 /* Disallow access to device special files */
+#define MOUNT_ATTR_NOEXEC 0x00000008 /* Disallow program execution */
+#define MOUNT_ATTR_NODIRATIME 0x00000080 /* Do not update directory access times */
+#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 /* Do not follow symlinks */
+
+/*
+ * mount_setattr()
+ */
+struct mount_attr {
+ __u64 attr_set;
+ __u64 attr_clr;
+ __u64 propagation;
+ __u64 userns_fd;
+};
+
#ifndef HAVE_FSOPEN
static inline int fsopen(const char *fsname, unsigned int flags)
{
@@ -61,6 +81,15 @@ static inline int open_tree(int dirfd, const char *pathname, unsigned int flags)
}
#endif /* HAVE_OPEN_TREE */
+#ifndef HAVE_MOUNT_SETATTR
+static inline int mount_setattr(int dirfd, const char *from_pathname, unsigned int flags,
+ struct mount_attr *attr, size_t size)
+{
+ return tst_syscall(__NR_mount_setattr, dirfd, from_pathname, flags,
+ attr, size);
+}
+#endif /* HAVE_MOUNT_SETATTR */
+
/*
* New headers added in kernel after 5.2 release, create them for old userspace.
*/
diff --git a/runtest/syscalls b/runtest/syscalls
index 6186bfc..1a47a2e 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -800,6 +800,8 @@ mount04 mount04
mount05 mount05
mount06 mount06
+mount_setattr01 mount_setattr01
+
move_mount01 move_mount01
move_mount02 move_mount02
diff --git a/testcases/kernel/syscalls/mount_setattr/.gitignore b/testcases/kernel/syscalls/mount_setattr/.gitignore
new file mode 100644
index 0000000..52a77b9
--- /dev/null
+++ b/testcases/kernel/syscalls/mount_setattr/.gitignore
@@ -0,0 +1 @@
+/mount_setattr01
diff --git a/testcases/kernel/syscalls/mount_setattr/Makefile b/testcases/kernel/syscalls/mount_setattr/Makefile
new file mode 100644
index 0000000..5ea7d67
--- /dev/null
+++ b/testcases/kernel/syscalls/mount_setattr/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+top_srcdir ?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/mount_setattr/mount_setattr01.c b/testcases/kernel/syscalls/mount_setattr/mount_setattr01.c
new file mode 100644
index 0000000..b4b1d85
--- /dev/null
+++ b/testcases/kernel/syscalls/mount_setattr/mount_setattr01.c
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2022 FUJITSU LIMITED. All rights reserved.
+ * Author: Dai Shili <daisl.fnst@fujitsu.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * Basic mount_setattr() test.
+ * Test whether the basic mount attributes are set and cleared correctly.
+ *
+ * Minimum Linux version required is v5.12.
+ */
+
+#include "tst_test.h"
+#include "lapi/fsmount.h"
+#include "lapi/stat.h"
+
+#define MNTPOINT "mntpoint"
+#define OT_MNTPOINT "ot_mntpoint"
+#define TCASE_ENTRY(_mount_attrs) {.name = #_mount_attrs, .mount_attrs = _mount_attrs}
+
+static int dir_created;
+
+static struct tcase {
+ char *name;
+ unsigned int mount_attrs;
+} tcases[] = {
+ TCASE_ENTRY(MOUNT_ATTR_RDONLY),
+ TCASE_ENTRY(MOUNT_ATTR_NOSUID),
+ TCASE_ENTRY(MOUNT_ATTR_NODEV),
+ TCASE_ENTRY(MOUNT_ATTR_NOEXEC),
+ TCASE_ENTRY(MOUNT_ATTR_NOSYMFOLLOW),
+ TCASE_ENTRY(MOUNT_ATTR_NODIRATIME),
+};
+
+static void cleanup(void)
+{
+ if (dir_created)
+ SAFE_RMDIR(OT_MNTPOINT);
+}
+
+static void setup(void)
+{
+ fsopen_supported_by_kernel();
+ SAFE_MKDIR(OT_MNTPOINT, 0777);
+ dir_created = 1;
+}
+
+static void run(unsigned int n)
+{
+ int otfd;
+ struct tcase *tc = &tcases[n];
+ struct mount_attr attr = {
+ .attr_set = tc->mount_attrs,
+ };
+
+ TEST(otfd = open_tree(AT_FDCWD, MNTPOINT, AT_EMPTY_PATH |
+ AT_SYMLINK_NOFOLLOW | OPEN_TREE_CLOEXEC | OPEN_TREE_CLONE));
+ if (otfd == -1) {
+ tst_res(TFAIL | TTERRNO, "open_tree() failed");
+ return;
+ }
+
+ TEST(mount_setattr(otfd, "", AT_EMPTY_PATH, &attr, sizeof(attr)));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "mount_setattr() set attr %s failed.", tc->name);
+ return;
+ }
+
+ attr.attr_clr = tc->mount_attrs;
+
+ TEST(mount_setattr(otfd, "", AT_EMPTY_PATH, &attr, sizeof(attr)));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "mount_setattr() clear attr %s failed.", tc->name);
+ return;
+ }
+
+ TEST(move_mount(otfd, "", AT_FDCWD, OT_MNTPOINT, MOVE_MOUNT_F_EMPTY_PATH));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "move_mount() failed");
+ return;
+ }
+
+ SAFE_CLOSE(otfd);
+
+ if (tst_is_mounted_at_tmpdir(OT_MNTPOINT)) {
+ SAFE_UMOUNT(OT_MNTPOINT);
+ tst_res(TPASS, "mount_setattr() set and clear attr %s passed.", tc->name);
+ }
+}
+
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_root = 1,
+ .mount_device = 1,
+ .mntpoint = MNTPOINT,
+ .all_filesystems = 1,
+ .skip_filesystems = (const char *const []){"fuse", NULL},
+};
--
1.8.3.1
More information about the ltp
mailing list