* [LTP] [PATCH V3 1/2] syscalls: Add tests for name_to_handle_at()
@ 2020-11-24 5:44 Viresh Kumar
2020-11-24 5:44 ` [LTP] [PATCH V3 2/2] syscalls: Add tests for open_by_handle_at() Viresh Kumar
2020-11-24 15:21 ` [LTP] [PATCH V3 1/2] syscalls: Add tests for name_to_handle_at() Cyril Hrubis
0 siblings, 2 replies; 6+ messages in thread
From: Viresh Kumar @ 2020-11-24 5:44 UTC (permalink / raw)
To: ltp
This adds basic success and failure tests for name_to_handle_at()
syscall.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
V2->V3:
- Implement name_to_handle_at() and open_by_handle_at() in the header
file with tst_syscall().
- Add test for dirfd referring to a file with AT_EMPTY_PATH flag.
include/lapi/name_to_handle_at.h | 63 ++++++++++
runtest/syscalls | 3 +
.../syscalls/name_to_handle_at/.gitignore | 2 +
.../syscalls/name_to_handle_at/Makefile | 7 ++
.../name_to_handle_at/name_to_handle_at01.c | 116 ++++++++++++++++++
.../name_to_handle_at/name_to_handle_at02.c | 82 +++++++++++++
6 files changed, 273 insertions(+)
create mode 100644 include/lapi/name_to_handle_at.h
create mode 100644 testcases/kernel/syscalls/name_to_handle_at/.gitignore
create mode 100644 testcases/kernel/syscalls/name_to_handle_at/Makefile
create mode 100644 testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at01.c
create mode 100644 testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at02.c
diff --git a/include/lapi/name_to_handle_at.h b/include/lapi/name_to_handle_at.h
new file mode 100644
index 000000000000..16cba239d769
--- /dev/null
+++ b/include/lapi/name_to_handle_at.h
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Linaro Limited. All rights reserved.
+ * Author: Viresh Kumar <viresh.kumar@linaro.org>
+ */
+
+#ifndef NAME_TO_HANDLE_AT_H__
+#define NAME_TO_HANDLE_AT_H__
+
+#include <sys/syscall.h>
+#include "config.h"
+#include "lapi/syscalls.h"
+#include "tst_buffers.h"
+#include "tst_test.h"
+
+#ifndef HAVE_NAME_TO_HANDLE_AT
+struct file_handle {
+ unsigned int handle_bytes;
+ int handle_type;
+ /* File identifier. */
+ unsigned char f_handle[0];
+};
+
+int name_to_handle_at(int dfd, const char *pathname, struct file_handle *handle,
+ int *mount_id, int flags)
+{
+ return tst_syscall(__NR_name_to_handle_at, dfd, pathname, handle,
+ mount_id, flags);
+}
+
+int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags)
+{
+ return tst_syscall(__NR_open_by_handle_at, mount_fd, handle, flags);
+}
+#endif
+
+/* Returns a valid pointer on success, NULL on errors */
+static inline struct file_handle *
+allocate_file_handle(int dfd, const char *pathname)
+{
+ struct file_handle fh = {}, *fhp;
+ int mount_id;
+
+ /*
+ * Make an initial call to name_to_handle_at() to discover the size
+ * required for the file handle.
+ */
+ TEST(name_to_handle_at(dfd, pathname, &fh, &mount_id, 0));
+ if (TST_RET != -1 || TST_ERR != EOVERFLOW) {
+ tst_res(TFAIL | TTERRNO,
+ "name_to_handle_at() should fail with EOVERFLOW");
+ return NULL;
+ }
+
+ /* Valid file handle */
+ fhp = tst_alloc(sizeof(*fhp) + fh.handle_bytes);
+ fhp->handle_type = fh.handle_type;
+ fhp->handle_bytes = fh.handle_bytes;
+
+ return fhp;
+}
+
+#endif /* NAME_TO_HANDLE_AT_H__ */
diff --git a/runtest/syscalls b/runtest/syscalls
index adf410ed11a4..e9299bf3fe2a 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -843,6 +843,9 @@ nanosleep01 nanosleep01
nanosleep02 nanosleep02
nanosleep04 nanosleep04
+name_to_handle_at01 name_to_handle_at01
+name_to_handle_at02 name_to_handle_at02
+
nftw01 nftw01
nftw6401 nftw6401
diff --git a/testcases/kernel/syscalls/name_to_handle_at/.gitignore b/testcases/kernel/syscalls/name_to_handle_at/.gitignore
new file mode 100644
index 000000000000..268a8a34f85e
--- /dev/null
+++ b/testcases/kernel/syscalls/name_to_handle_at/.gitignore
@@ -0,0 +1,2 @@
+name_to_handle_at01
+name_to_handle_at02
diff --git a/testcases/kernel/syscalls/name_to_handle_at/Makefile b/testcases/kernel/syscalls/name_to_handle_at/Makefile
new file mode 100644
index 000000000000..18896b6f28c0
--- /dev/null
+++ b/testcases/kernel/syscalls/name_to_handle_at/Makefile
@@ -0,0 +1,7 @@
+# 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/name_to_handle_at/name_to_handle_at01.c b/testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at01.c
new file mode 100644
index 000000000000..ef56f2a86cb8
--- /dev/null
+++ b/testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at01.c
@@ -0,0 +1,116 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Viresh Kumar <viresh.kumar@linaro.org>
+ */
+
+/*\
+ * [DESCRIPTION]
+ *
+ * Basic name_to_handle_at() tests.
+ *
+ * [ALGORITHM]
+ * - Check that EOVERFLOW is returned as expected by name_to_handle_at().
+ * - Check that we were able to access a file's stat with name_to_handle_at()
+ * and open_by_handle_at().
+\*/
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include <sys/stat.h>
+#include "lapi/name_to_handle_at.h"
+
+#define TEST_FILE "test_file"
+#define TEST_DIR "test_dir"
+
+static int dir_fd, fd_atcwd = AT_FDCWD, file_fd;
+static struct file_handle *fhp;
+
+static struct tcase {
+ int *dfd;
+ const char *pathname;
+ int name_flags;
+ int flags;
+} tcases[] = {
+ {&dir_fd, TEST_FILE, 0, O_RDWR},
+ {&dir_fd, TEST_FILE, 0, O_RDONLY},
+ {&dir_fd, TEST_FILE, 0, O_WRONLY},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_RDWR},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_RDONLY},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_WRONLY},
+ {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDWR},
+ {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDONLY},
+ {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_WRONLY},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDWR},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDONLY},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_WRONLY},
+ {&dir_fd, "", AT_EMPTY_PATH, O_RDONLY},
+ {&file_fd, "", AT_EMPTY_PATH, O_RDONLY},
+
+ {&fd_atcwd, TEST_FILE, 0, O_RDWR},
+ {&fd_atcwd, TEST_FILE, 0, O_RDONLY},
+ {&fd_atcwd, TEST_FILE, 0, O_WRONLY},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_RDWR},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_RDONLY},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_WRONLY},
+ {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDWR},
+ {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDONLY},
+ {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_WRONLY},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDWR},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDONLY},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_WRONLY},
+ {&fd_atcwd, "", AT_EMPTY_PATH, O_RDONLY},
+};
+
+static void cleanup(void)
+{
+ SAFE_CLOSE(dir_fd);
+ SAFE_CLOSE(file_fd);
+}
+
+static void setup(void)
+{
+ SAFE_MKDIR(TEST_DIR, 0700);
+ dir_fd = SAFE_OPEN(TEST_DIR, O_DIRECTORY);
+ SAFE_CHDIR(TEST_DIR);
+ SAFE_TOUCH(TEST_FILE, 0600, NULL);
+ file_fd = SAFE_OPEN("foo_file", O_RDWR | O_CREAT);
+ fhp = allocate_file_handle(AT_FDCWD, TEST_FILE);
+}
+
+static void run(unsigned int n)
+{
+ struct tcase *tc = &tcases[n];
+ struct stat file_stat;
+ int fd, mount_id;
+
+ TEST(name_to_handle_at(*tc->dfd, tc->pathname, fhp, &mount_id,
+ tc->name_flags));
+ if (TST_RET) {
+ tst_res(TFAIL | TTERRNO, "name_to_handle_at() failed (%d)", n);
+ return;
+ }
+
+ TEST(fd = open_by_handle_at(*tc->dfd, fhp, tc->flags));
+ if (fd < 0) {
+ tst_res(TFAIL | TTERRNO, "open_by_handle_at() failed (%d)", n);
+ return;
+ }
+
+ SAFE_FSTAT(fd, &file_stat);
+
+ /* Don't check stats when pathname is empty */
+ if (file_stat.st_size == 0 || !tc->pathname[0])
+ tst_res(TPASS, "name_to_handle_at() passed (%d)", n);
+ else
+ tst_res(TFAIL, "fstat() didn't work as expected (%d)", n);
+
+ SAFE_CLOSE(fd);
+}
+
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+};
diff --git a/testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at02.c b/testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at02.c
new file mode 100644
index 000000000000..4e73b2f5dee8
--- /dev/null
+++ b/testcases/kernel/syscalls/name_to_handle_at/name_to_handle_at02.c
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Viresh Kumar <viresh.kumar@linaro.org>
+ */
+
+/*\
+ * [DESCRIPTION]
+ *
+ * Failure tests for name_to_handle_at().
+\*/
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include "lapi/name_to_handle_at.h"
+
+#define TEST_FILE "test_file"
+
+static struct file_handle fh, high_fh = {.handle_bytes = MAX_HANDLE_SZ + 1};
+static struct file_handle *valid_fhp = &fh, *invalid_fhp, *high_fhp = &high_fh;
+static int mount_id, *valid_mount_id = &mount_id, *invalid_mount_id;
+static const char *valid_path = TEST_FILE, *invalid_path, *empty_path = "";
+
+static struct tcase {
+ const char *name;
+ int dfd;
+ const char **pathname;
+ int flags;
+ struct file_handle **fhp;
+ int **mount_id;
+ int exp_errno;
+} tcases[] = {
+ {"invalid-dfd", -1, &valid_path, 0, &valid_fhp, &valid_mount_id, EBADF},
+ {"not a directory", 0, &valid_path, 0, &valid_fhp, &valid_mount_id, ENOTDIR},
+ {"invalid-path", AT_FDCWD, &invalid_path, 0, &valid_fhp, &valid_mount_id, EFAULT},
+ {"invalid-file-handle", AT_FDCWD, &valid_path, 0, &invalid_fhp, &valid_mount_id, EFAULT},
+ {"zero-file-handle-size", AT_FDCWD, &valid_path, 0, &valid_fhp, &valid_mount_id, EOVERFLOW},
+ {"high-file-handle-size", AT_FDCWD, &valid_path, 0, &high_fhp, &valid_mount_id, EINVAL},
+ {"invalid-mount_id", AT_FDCWD, &valid_path, 0, &valid_fhp, &invalid_mount_id, EFAULT},
+ {"invalid-flags", AT_FDCWD, &valid_path, -1, &valid_fhp, &valid_mount_id, EINVAL},
+ {"empty-path", AT_FDCWD, &empty_path, 0, &valid_fhp, &valid_mount_id, ENOENT},
+};
+
+static void setup(void)
+{
+ void *faulty_address;
+
+ SAFE_TOUCH(TEST_FILE, 0600, NULL);
+ faulty_address = tst_get_bad_addr(NULL);
+ invalid_fhp = faulty_address;
+ invalid_mount_id = faulty_address;
+ invalid_path = faulty_address;
+}
+
+static void run(unsigned int n)
+{
+ struct tcase *tc = &tcases[n];
+
+ TEST(name_to_handle_at(tc->dfd, *tc->pathname, *tc->fhp, *tc->mount_id,
+ tc->flags));
+
+ if (TST_RET != -1) {
+ tst_res(TFAIL, "%s: name_to_handle_at() passed unexpectedly",
+ tc->name);
+ return;
+ }
+
+ if (tc->exp_errno != TST_ERR) {
+ tst_res(TFAIL | TTERRNO,
+ "%s: name_to_handle_at() should fail with %s", tc->name,
+ tst_strerrno(tc->exp_errno));
+ return;
+ }
+
+ tst_res(TPASS | TTERRNO, "%s: name_to_handle_at() failed as expected",
+ tc->name);
+}
+
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = run,
+ .setup = setup,
+ .needs_tmpdir = 1,
+};
--
2.25.0.rc1.19.g042ed3e048af
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [LTP] [PATCH V3 2/2] syscalls: Add tests for open_by_handle_at()
2020-11-24 5:44 [LTP] [PATCH V3 1/2] syscalls: Add tests for name_to_handle_at() Viresh Kumar
@ 2020-11-24 5:44 ` Viresh Kumar
2020-11-24 15:24 ` Cyril Hrubis
2020-11-24 15:21 ` [LTP] [PATCH V3 1/2] syscalls: Add tests for name_to_handle_at() Cyril Hrubis
1 sibling, 1 reply; 6+ messages in thread
From: Viresh Kumar @ 2020-11-24 5:44 UTC (permalink / raw)
To: ltp
This adds basic success and failure tests for open_by_handle_at()
syscall.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
runtest/syscalls | 3 +
.../syscalls/open_by_handle_at/.gitignore | 2 +
.../syscalls/open_by_handle_at/Makefile | 7 ++
.../open_by_handle_at/open_by_handle_at01.c | 115 ++++++++++++++++++
.../open_by_handle_at/open_by_handle_at02.c | 109 +++++++++++++++++
5 files changed, 236 insertions(+)
create mode 100644 testcases/kernel/syscalls/open_by_handle_at/.gitignore
create mode 100644 testcases/kernel/syscalls/open_by_handle_at/Makefile
create mode 100644 testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at01.c
create mode 100644 testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at02.c
diff --git a/runtest/syscalls b/runtest/syscalls
index e9299bf3fe2a..25179b74ecdf 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -879,6 +879,9 @@ openat201 openat201
openat202 openat202
openat203 openat203
+open_by_handle_at01 open_by_handle_at01
+open_by_handle_at02 open_by_handle_at02
+
open_tree01 open_tree01
open_tree02 open_tree02
diff --git a/testcases/kernel/syscalls/open_by_handle_at/.gitignore b/testcases/kernel/syscalls/open_by_handle_at/.gitignore
new file mode 100644
index 000000000000..799eba82a90b
--- /dev/null
+++ b/testcases/kernel/syscalls/open_by_handle_at/.gitignore
@@ -0,0 +1,2 @@
+open_by_handle_at01
+open_by_handle_at02
diff --git a/testcases/kernel/syscalls/open_by_handle_at/Makefile b/testcases/kernel/syscalls/open_by_handle_at/Makefile
new file mode 100644
index 000000000000..18896b6f28c0
--- /dev/null
+++ b/testcases/kernel/syscalls/open_by_handle_at/Makefile
@@ -0,0 +1,7 @@
+# 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/open_by_handle_at/open_by_handle_at01.c b/testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at01.c
new file mode 100644
index 000000000000..35597a13c182
--- /dev/null
+++ b/testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at01.c
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Viresh Kumar <viresh.kumar@linaro.org>
+ */
+
+/*\
+ * [DESCRIPTION]
+ *
+ * Basic open_by_handle_at() tests.
+ *
+ * [ALGORITHM]
+ * - Check that we were able to access a file's stat which is opened with
+ * open_by_handle_at().
+\*/
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include <sys/stat.h>
+#include "lapi/name_to_handle_at.h"
+
+#define TEST_FILE "test_file"
+#define TEST_DIR "test_dir"
+
+static int dir_fd, fd_atcwd = AT_FDCWD, file_fd;
+static struct file_handle *fhp;
+
+static struct tcase {
+ int *dfd;
+ const char *pathname;
+ int name_flags;
+ int flags;
+} tcases[] = {
+ {&dir_fd, TEST_FILE, 0, O_RDWR},
+ {&dir_fd, TEST_FILE, 0, O_RDONLY},
+ {&dir_fd, TEST_FILE, 0, O_WRONLY},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_RDWR},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_RDONLY},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_WRONLY},
+ {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDWR},
+ {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDONLY},
+ {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_WRONLY},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDWR},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDONLY},
+ {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_WRONLY},
+ {&dir_fd, "", AT_EMPTY_PATH, O_RDONLY},
+ {&file_fd, "", AT_EMPTY_PATH, O_RDONLY},
+
+ {&fd_atcwd, TEST_FILE, 0, O_RDWR},
+ {&fd_atcwd, TEST_FILE, 0, O_RDONLY},
+ {&fd_atcwd, TEST_FILE, 0, O_WRONLY},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_RDWR},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_RDONLY},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_WRONLY},
+ {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDWR},
+ {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDONLY},
+ {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_WRONLY},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDWR},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDONLY},
+ {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_WRONLY},
+ {&fd_atcwd, "", AT_EMPTY_PATH, O_RDONLY},
+};
+
+static void cleanup(void)
+{
+ SAFE_CLOSE(dir_fd);
+ SAFE_CLOSE(file_fd);
+}
+
+static void setup(void)
+{
+ SAFE_MKDIR(TEST_DIR, 0700);
+ dir_fd = SAFE_OPEN(TEST_DIR, O_DIRECTORY);
+ SAFE_CHDIR(TEST_DIR);
+ SAFE_TOUCH(TEST_FILE, 0600, NULL);
+ file_fd = SAFE_OPEN("foo_file", O_RDWR | O_CREAT);
+ fhp = allocate_file_handle(AT_FDCWD, TEST_FILE);
+}
+
+static void run(unsigned int n)
+{
+ struct tcase *tc = &tcases[n];
+ struct stat file_stat;
+ int fd, mount_id;
+
+ TEST(name_to_handle_at(*tc->dfd, tc->pathname, fhp, &mount_id,
+ tc->name_flags));
+ if (TST_RET) {
+ tst_res(TFAIL | TTERRNO, "name_to_handle_at() failed (%d)", n);
+ return;
+ }
+
+ TEST(fd = open_by_handle_at(*tc->dfd, fhp, tc->flags));
+ if (fd < 0) {
+ tst_res(TFAIL | TTERRNO, "open_by_handle_at() failed (%d)", n);
+ return;
+ }
+
+ SAFE_FSTAT(fd, &file_stat);
+
+ /* Don't check stats when pathname is empty */
+ if (file_stat.st_size == 0 || !tc->pathname[0])
+ tst_res(TPASS, "open_by_handle_at() passed (%d)", n);
+ else
+ tst_res(TFAIL, "fstat() didn't work as expected (%d)", n);
+
+ SAFE_CLOSE(fd);
+}
+
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+};
diff --git a/testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at02.c b/testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at02.c
new file mode 100644
index 000000000000..3c8f06d854c1
--- /dev/null
+++ b/testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at02.c
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Viresh Kumar <viresh.kumar@linaro.org>
+ */
+
+/*\
+ * [DESCRIPTION]
+ *
+ * Failure tests for open_by_handle_at().
+\*/
+#define _GNU_SOURCE
+#include <linux/capability.h>
+#include <fcntl.h>
+#include "tst_capability.h"
+#include "lapi/name_to_handle_at.h"
+
+#define TEST_FILE "test_file"
+#define FOO_SYMLINK "foo_symlink"
+
+static struct file_handle high_fh = {.handle_bytes = MAX_HANDLE_SZ + 1}, *high_fhp = &high_fh;
+static struct file_handle zero_fh, *zero_fhp = &zero_fh;
+static struct file_handle *valid_fhp, *invalid_fhp, *link_fhp;
+
+static struct tst_cap cap_req = TST_CAP(TST_CAP_REQ, CAP_DAC_READ_SEARCH);
+static struct tst_cap cap_drop = TST_CAP(TST_CAP_DROP, CAP_DAC_READ_SEARCH);
+
+static struct tcase {
+ const char *name;
+ int dfd;
+ struct file_handle **fhp;
+ int flags;
+ int cap;
+ int exp_errno;
+} tcases[] = {
+ {"invalid-dfd", -1, &valid_fhp, O_RDWR, 0, EBADF},
+ {"stale-dfd", 0, &valid_fhp, O_RDWR, 0, ESTALE},
+ {"invalid-file-handle", AT_FDCWD, &invalid_fhp, O_RDWR, 0, EFAULT},
+ {"high-file-handle-size", AT_FDCWD, &high_fhp, O_RDWR, 0, EINVAL},
+ {"zero-file-handle-size", AT_FDCWD, &zero_fhp, O_RDWR, 0, EINVAL},
+ {"no-capability", AT_FDCWD, &valid_fhp, O_RDWR, 1, EPERM},
+ {"symlink", AT_FDCWD, &link_fhp, O_RDWR, 0, ELOOP},
+};
+
+static void setup(void)
+{
+ void *faulty_address;
+ int mount_id;
+
+ SAFE_TOUCH(TEST_FILE, 0600, NULL);
+ SAFE_SYMLINK(TEST_FILE, FOO_SYMLINK);
+ faulty_address = tst_get_bad_addr(NULL);
+ invalid_fhp = faulty_address;
+
+ valid_fhp = allocate_file_handle(AT_FDCWD, TEST_FILE);
+ if (!valid_fhp)
+ return;
+
+ TEST(name_to_handle_at(AT_FDCWD, TEST_FILE, valid_fhp, &mount_id, 0));
+ if (TST_RET)
+ tst_res(TFAIL | TTERRNO, "name_to_handle_at() failed");
+
+ /* Symlink's file handle */
+ link_fhp = tst_alloc(sizeof(*link_fhp) + valid_fhp->handle_bytes);
+ link_fhp->handle_type = valid_fhp->handle_type;
+ link_fhp->handle_bytes = valid_fhp->handle_bytes;
+
+ TEST(name_to_handle_at(AT_FDCWD, FOO_SYMLINK, link_fhp, &mount_id, 0));
+ if (TST_RET)
+ tst_res(TFAIL | TTERRNO, "name_to_handle_at() failed");
+}
+
+static void run(unsigned int n)
+{
+ struct tcase *tc = &tcases[n];
+ int fd;
+
+ if (tc->cap)
+ tst_cap_action(&cap_drop);
+
+ TEST(fd = open_by_handle_at(tc->dfd, *tc->fhp, tc->flags));
+
+ if (tc->cap)
+ tst_cap_action(&cap_req);
+
+ if (TST_RET != -1) {
+ SAFE_CLOSE(fd);
+ tst_res(TFAIL, "%s: open_by_handle_at() passed unexpectedly",
+ tc->name);
+ return;
+ }
+
+ if (tc->exp_errno != TST_ERR) {
+ tst_res(TFAIL | TTERRNO,
+ "%s: open_by_handle_at() should fail with %s", tc->name,
+ tst_strerrno(tc->exp_errno));
+ return;
+ }
+
+ tst_res(TPASS | TTERRNO, "%s: open_by_handle_at() failed as expected",
+ tc->name);
+}
+
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = run,
+ .setup = setup,
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+};
--
2.25.0.rc1.19.g042ed3e048af
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [LTP] [PATCH V3 1/2] syscalls: Add tests for name_to_handle_at()
2020-11-24 5:44 [LTP] [PATCH V3 1/2] syscalls: Add tests for name_to_handle_at() Viresh Kumar
2020-11-24 5:44 ` [LTP] [PATCH V3 2/2] syscalls: Add tests for open_by_handle_at() Viresh Kumar
@ 2020-11-24 15:21 ` Cyril Hrubis
1 sibling, 0 replies; 6+ messages in thread
From: Cyril Hrubis @ 2020-11-24 15:21 UTC (permalink / raw)
To: ltp
Hi!
I've changed the fallback definitions in lapi to static inline and
pushed, thanks.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 6+ messages in thread
* [LTP] [PATCH V3 2/2] syscalls: Add tests for open_by_handle_at()
2020-11-24 5:44 ` [LTP] [PATCH V3 2/2] syscalls: Add tests for open_by_handle_at() Viresh Kumar
@ 2020-11-24 15:24 ` Cyril Hrubis
2020-12-08 10:59 ` [LTP] [PATCH] syscalls: Allocate handles at setup time only Viresh Kumar
0 siblings, 1 reply; 6+ messages in thread
From: Cyril Hrubis @ 2020-11-24 15:24 UTC (permalink / raw)
To: ltp
Hi!
> +#define _GNU_SOURCE
> +#include <fcntl.h>
> +#include <sys/stat.h>
> +#include "lapi/name_to_handle_at.h"
> +
> +#define TEST_FILE "test_file"
> +#define TEST_DIR "test_dir"
> +
> +static int dir_fd, fd_atcwd = AT_FDCWD, file_fd;
> +static struct file_handle *fhp;
> +
> +static struct tcase {
> + int *dfd;
> + const char *pathname;
> + int name_flags;
> + int flags;
> +} tcases[] = {
> + {&dir_fd, TEST_FILE, 0, O_RDWR},
> + {&dir_fd, TEST_FILE, 0, O_RDONLY},
> + {&dir_fd, TEST_FILE, 0, O_WRONLY},
> + {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_RDWR},
> + {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_RDONLY},
> + {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_WRONLY},
> + {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDWR},
> + {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDONLY},
> + {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_WRONLY},
> + {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDWR},
> + {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDONLY},
> + {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_WRONLY},
> + {&dir_fd, "", AT_EMPTY_PATH, O_RDONLY},
> + {&file_fd, "", AT_EMPTY_PATH, O_RDONLY},
> +
> + {&fd_atcwd, TEST_FILE, 0, O_RDWR},
> + {&fd_atcwd, TEST_FILE, 0, O_RDONLY},
> + {&fd_atcwd, TEST_FILE, 0, O_WRONLY},
> + {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_RDWR},
> + {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_RDONLY},
> + {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_WRONLY},
> + {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDWR},
> + {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDONLY},
> + {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_WRONLY},
> + {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDWR},
> + {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDONLY},
> + {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_WRONLY},
> + {&fd_atcwd, "", AT_EMPTY_PATH, O_RDONLY},
> +};
I guess that we can do better than exact copy of the
name_to_handle_at01.c.
We can as well create two handles in the test setup one for directory
and one for file and then loop over different flags for
open_by_handle_at() instead of getting the handle in each run()
iteration.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 6+ messages in thread
* [LTP] [PATCH] syscalls: Allocate handles at setup time only
2020-11-24 15:24 ` Cyril Hrubis
@ 2020-12-08 10:59 ` Viresh Kumar
2020-12-08 11:08 ` Cyril Hrubis
0 siblings, 1 reply; 6+ messages in thread
From: Viresh Kumar @ 2020-12-08 10:59 UTC (permalink / raw)
To: ltp
Move the allocation of handles to setup time only, so the run() helper
can focus on the syscall to test.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
Cyril, I think you merged the patch for open_by_handle_at by mistake,
and that too without your signed-off.
commit 81e0821e1fc1 ("syscalls: Add tests for open_by_handle_at()")
Here is what you asked for in your earlier email.
.../open_by_handle_at/open_by_handle_at01.c | 83 +++++++++----------
1 file changed, 41 insertions(+), 42 deletions(-)
diff --git a/testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at01.c b/testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at01.c
index 35597a13c182..2583bc3a186d 100644
--- a/testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at01.c
+++ b/testcases/kernel/syscalls/open_by_handle_at/open_by_handle_at01.c
@@ -21,42 +21,23 @@
#define TEST_DIR "test_dir"
static int dir_fd, fd_atcwd = AT_FDCWD, file_fd;
-static struct file_handle *fhp;
+static struct file_handle *f_fhp, *d_fhp, *at_fhp;
+static struct file_handle *f_fhp, *d_fhp, *at_fhp;
static struct tcase {
int *dfd;
- const char *pathname;
- int name_flags;
+ struct file_handle **fhp;
int flags;
} tcases[] = {
- {&dir_fd, TEST_FILE, 0, O_RDWR},
- {&dir_fd, TEST_FILE, 0, O_RDONLY},
- {&dir_fd, TEST_FILE, 0, O_WRONLY},
- {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_RDWR},
- {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_RDONLY},
- {&dir_fd, TEST_FILE, AT_EMPTY_PATH, O_WRONLY},
- {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDWR},
- {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDONLY},
- {&dir_fd, TEST_FILE, AT_SYMLINK_FOLLOW, O_WRONLY},
- {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDWR},
- {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDONLY},
- {&dir_fd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_WRONLY},
- {&dir_fd, "", AT_EMPTY_PATH, O_RDONLY},
- {&file_fd, "", AT_EMPTY_PATH, O_RDONLY},
-
- {&fd_atcwd, TEST_FILE, 0, O_RDWR},
- {&fd_atcwd, TEST_FILE, 0, O_RDONLY},
- {&fd_atcwd, TEST_FILE, 0, O_WRONLY},
- {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_RDWR},
- {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_RDONLY},
- {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH, O_WRONLY},
- {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDWR},
- {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_RDONLY},
- {&fd_atcwd, TEST_FILE, AT_SYMLINK_FOLLOW, O_WRONLY},
- {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDWR},
- {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_RDONLY},
- {&fd_atcwd, TEST_FILE, AT_EMPTY_PATH | AT_SYMLINK_FOLLOW, O_WRONLY},
- {&fd_atcwd, "", AT_EMPTY_PATH, O_RDONLY},
+ {&dir_fd, &d_fhp, O_RDWR},
+ {&dir_fd, &d_fhp, O_RDONLY},
+ {&dir_fd, &d_fhp, O_WRONLY},
+ {&file_fd, &f_fhp, O_RDWR},
+ {&file_fd, &f_fhp, O_RDONLY},
+ {&file_fd, &f_fhp, O_WRONLY},
+ {&fd_atcwd, &at_fhp, O_RDWR},
+ {&fd_atcwd, &at_fhp, O_RDONLY},
+ {&fd_atcwd, &at_fhp, O_WRONLY},
};
static void cleanup(void)
@@ -67,28 +48,46 @@ static void cleanup(void)
static void setup(void)
{
+ int mount_id;
+
SAFE_MKDIR(TEST_DIR, 0700);
dir_fd = SAFE_OPEN(TEST_DIR, O_DIRECTORY);
SAFE_CHDIR(TEST_DIR);
SAFE_TOUCH(TEST_FILE, 0600, NULL);
file_fd = SAFE_OPEN("foo_file", O_RDWR | O_CREAT);
- fhp = allocate_file_handle(AT_FDCWD, TEST_FILE);
+
+ f_fhp = allocate_file_handle(AT_FDCWD, TEST_FILE);
+ d_fhp = allocate_file_handle(AT_FDCWD, TEST_FILE);
+ at_fhp = allocate_file_handle(AT_FDCWD, TEST_FILE);
+
+ TEST(name_to_handle_at(file_fd, "", f_fhp, &mount_id, AT_EMPTY_PATH));
+ if (TST_RET) {
+ tst_res(TFAIL | TTERRNO, "name_to_handle_at() failed");
+ return;
+ }
+
+ TEST(name_to_handle_at(dir_fd, TEST_FILE, d_fhp, &mount_id,
+ AT_EMPTY_PATH | AT_SYMLINK_FOLLOW));
+ if (TST_RET) {
+ tst_res(TFAIL | TTERRNO, "name_to_handle_at() failed");
+ return;
+ }
+
+ TEST(name_to_handle_at(AT_FDCWD, TEST_FILE, at_fhp, &mount_id,
+ AT_EMPTY_PATH | AT_SYMLINK_FOLLOW));
+ if (TST_RET) {
+ tst_res(TFAIL | TTERRNO, "name_to_handle_at() failed");
+ return;
+ }
}
static void run(unsigned int n)
{
struct tcase *tc = &tcases[n];
struct stat file_stat;
- int fd, mount_id;
-
- TEST(name_to_handle_at(*tc->dfd, tc->pathname, fhp, &mount_id,
- tc->name_flags));
- if (TST_RET) {
- tst_res(TFAIL | TTERRNO, "name_to_handle_at() failed (%d)", n);
- return;
- }
+ int fd;
- TEST(fd = open_by_handle_at(*tc->dfd, fhp, tc->flags));
+ TEST(fd = open_by_handle_at(*tc->dfd, *tc->fhp, tc->flags));
if (fd < 0) {
tst_res(TFAIL | TTERRNO, "open_by_handle_at() failed (%d)", n);
return;
@@ -97,7 +96,7 @@ static void run(unsigned int n)
SAFE_FSTAT(fd, &file_stat);
/* Don't check stats when pathname is empty */
- if (file_stat.st_size == 0 || !tc->pathname[0])
+ if (file_stat.st_size == 0 || (tc->fhp == &f_fhp))
tst_res(TPASS, "open_by_handle_at() passed (%d)", n);
else
tst_res(TFAIL, "fstat() didn't work as expected (%d)", n);
--
2.25.0.rc1.19.g042ed3e048af
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [LTP] [PATCH] syscalls: Allocate handles at setup time only
2020-12-08 10:59 ` [LTP] [PATCH] syscalls: Allocate handles at setup time only Viresh Kumar
@ 2020-12-08 11:08 ` Cyril Hrubis
0 siblings, 0 replies; 6+ messages in thread
From: Cyril Hrubis @ 2020-12-08 11:08 UTC (permalink / raw)
To: ltp
Hi!
> Cyril, I think you merged the patch for open_by_handle_at by mistake,
> and that too without your signed-off.
Sorry, looks like I had messed up again. I will revert that one and
apply it again with these changes on the top. Thanks a lot.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-08 11:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 5:44 [LTP] [PATCH V3 1/2] syscalls: Add tests for name_to_handle_at() Viresh Kumar
2020-11-24 5:44 ` [LTP] [PATCH V3 2/2] syscalls: Add tests for open_by_handle_at() Viresh Kumar
2020-11-24 15:24 ` Cyril Hrubis
2020-12-08 10:59 ` [LTP] [PATCH] syscalls: Allocate handles at setup time only Viresh Kumar
2020-12-08 11:08 ` Cyril Hrubis
2020-11-24 15:21 ` [LTP] [PATCH V3 1/2] syscalls: Add tests for name_to_handle_at() Cyril Hrubis
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.