[LTP] [PATCH] open07: Convert to new API
Martin Doucha
mdoucha@suse.cz
Mon Feb 19 14:40:29 CET 2024
Signed-off-by: Martin Doucha <mdoucha@suse.cz>
---
testcases/kernel/syscalls/open/open07.c | 289 +++++-------------------
1 file changed, 60 insertions(+), 229 deletions(-)
diff --git a/testcases/kernel/syscalls/open/open07.c b/testcases/kernel/syscalls/open/open07.c
index f36db00cb..87743f51d 100644
--- a/testcases/kernel/syscalls/open/open07.c
+++ b/testcases/kernel/syscalls/open/open07.c
@@ -1,249 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
- *
- * Copyright (c) International Business Machines Corp., 2001
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (c) International Business Machines Corp., 2001
+ * 07/2001 Ported by Wayne Boyer
+ * Copyright (c) 2024 SUSE LLC <mdoucha@suse.cz>
*/
-/*
- * NAME
- * open07.c
- *
- * DESCRIPTION
- * Test the open(2) system call to ensure that it sets ELOOP correctly.
- *
- * CALLS
- * open()
- *
- * ALGORITHM
- * 1. Create a symbolic link to a file, and call open(O_NOFOLLOW). Check
- * that it returns ELOOP.
+/*\
+ * [Description]
*
- * 2. Create a symbolic link to a directory, and call open(O_NOFOLLOW).
- * Check that it returns ELOOP.
- *
- * 3. Create a symbolic link to a symbolic link, and call open(O_NOFOLLOW).
- * Check that it returns ELOOP.
- *
- * 4. Create a symbolic link to a symbolically linked directory, and call
- * open(O_NOFOLLOW). Check that it returns ELOOP.
- *
- * 5. Create a symbolic link to a directory, and call
- * open("link/", O_NOFOLLOW). Check that it succeeds.
- *
- * USAGE: <for command-line>
- * open07 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.
- * -i n : Execute test n times.
- * -I x : Execute test for x seconds.
- * -P x : Pause for x seconds between iterations.
- * -t : Turn on syscall timing.
- *
- * HISTORY
- * 07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * None
+ * Test functionality and error conditions of open(O_NOFOLLOW) system call.
*/
+
#define _GNU_SOURCE /* for O_NOFOLLOW */
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
#include <sys/stat.h>
-#include <fcntl.h>
-#include "test.h"
-#include "safe_macros.h"
-
-static void setup(void);
-static void cleanup(void);
-static void setupfunc_test1();
-static void setupfunc_test2();
-static void setupfunc_test3();
-static void setupfunc_test4();
-static void setupfunc_test5();
-
-char *TCID = "open07";
-int TST_TOTAL = 5;
-
-static int fd1, fd2;
-
-static struct test_case_t {
- char *desc;
- char filename[100];
- int flags;
- int mode;
- void (*setupfunc) ();
- int exp_errno;
-} TC[] = {
- {"Test for ELOOP on f2: f1 -> f2", {},
- O_NOFOLLOW, 00700, setupfunc_test1, ELOOP},
- {"Test for ELOOP on d2: d1 -> d2", {},
- O_NOFOLLOW, 00700, setupfunc_test2, ELOOP},
- {"Test for ELOOP on f3: f1 -> f2 -> f3", {},
- O_NOFOLLOW, 00700, setupfunc_test3, ELOOP},
- {"Test for ELOOP on d3: d1 -> d2 -> d3", {},
- O_NOFOLLOW, 00700, setupfunc_test4, ELOOP},
- {"Test for success on d2: d1 -> d2", {},
- O_NOFOLLOW, 00700, setupfunc_test5, 0},
- {NULL, {}, 0, 0, NULL, 0}
+#include "tst_test.h"
+#include "tst_safe_macros.h"
+
+#define TESTFILE "testfile"
+#define TESTDIR "testdir"
+#define SYMFILE1 "symfile1"
+#define SYMFILE2 "symfile2"
+#define SYMDIR1 "symdir1"
+#define SYMDIR2 "symdir2"
+#define PASSFILE "symdir1/testfile"
+
+static int fd = -1;
+
+static struct testcase {
+ const char *path;
+ int err;
+ const char *desc;
+} testcase_list[] = {
+ {SYMFILE1, ELOOP, "open(O_NOFOLLOW) a symlink to file"},
+ {SYMFILE2, ELOOP, "open(O_NOFOLLOW) a double symlink to file"},
+ {SYMDIR1, ELOOP, "open(O_NOFOLLOW) a symlink to directory"},
+ {SYMDIR2, ELOOP, "open(O_NOFOLLOW) a double symlink to directory"},
+ {PASSFILE, 0, "open(O_NOFOLLOW) a file in symlinked directory"},
};
-int main(int ac, char **av)
-{
- int lc;
- int i;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- /* run the setup routines for the individual tests */
- for (i = 0; i < TST_TOTAL; i++) {
- if (TC[i].setupfunc != NULL)
- TC[i].setupfunc();
- }
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- tst_count = 0;
-
- for (i = 0; TC[i].desc != NULL; ++i) {
- TEST(open(TC[i].filename, TC[i].flags, TC[i].mode));
-
- if (TC[i].exp_errno != 0) {
- if (TEST_RETURN != -1) {
- tst_resm(TFAIL, "open succeeded "
- "unexpectedly");
- }
-
- if (TEST_ERRNO != TC[i].exp_errno) {
- tst_resm(TFAIL, "open returned "
- "unexpected errno, expected: "
- "%d, got: %d",
- TC[i].exp_errno, TEST_ERRNO);
- } else {
- tst_resm(TPASS, "open returned "
- "expected ELOOP error");
- }
- } else {
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL, "open failed "
- "unexpectedly with errno %d",
- TEST_ERRNO);
- } else {
- tst_resm(TPASS, "open succeeded as "
- "expected");
- }
- }
-
- if (TEST_RETURN != -1)
- close(TEST_RETURN);
- }
- }
-
- cleanup();
- tst_exit();
-}
-
-static void setupfunc_test1(void)
-{
- char file1[100], file2[100];
-
- sprintf(file1, "open03.1.%d", getpid());
- sprintf(file2, "open03.2.%d", getpid());
- fd1 = SAFE_CREAT(cleanup, file1, 00700);
-
- SAFE_SYMLINK(cleanup, file1, file2);
-
- strcpy(TC[0].filename, file2);
-}
-
-static void setupfunc_test2(void)
-{
- char file1[100], file2[100];
-
- sprintf(file1, "open03.3.%d", getpid());
- sprintf(file2, "open03.4.%d", getpid());
- SAFE_MKDIR(cleanup, file1, 00700);
-
- SAFE_SYMLINK(cleanup, file1, file2);
-
- strcpy(TC[1].filename, file2);
-}
-
-static void setupfunc_test3(void)
-{
- char file1[100], file2[100], file3[100];
-
- sprintf(file1, "open03.5.%d", getpid());
- sprintf(file2, "open03.6.%d", getpid());
- sprintf(file3, "open03.7.%d", getpid());
- fd2 = SAFE_CREAT(cleanup, file1, 00700);
-
- SAFE_SYMLINK(cleanup, file1, file2);
-
- SAFE_SYMLINK(cleanup, file2, file3);
-
- strcpy(TC[2].filename, file3);
-}
-
-static void setupfunc_test4(void)
-{
- char file1[100], file2[100], file3[100];
-
- sprintf(file1, "open03.8.%d", getpid());
- sprintf(file2, "open03.9.%d", getpid());
- sprintf(file3, "open03.10.%d", getpid());
- SAFE_MKDIR(cleanup, file1, 00700);
-
- SAFE_SYMLINK(cleanup, file1, file2);
-
- SAFE_SYMLINK(cleanup, file2, file3);
-
- strcpy(TC[3].filename, file3);
-}
-
-static void setupfunc_test5(void)
+static void setup(void)
{
- char file1[100], file2[100];
-
- sprintf(file1, "open11.3.%d", getpid());
- sprintf(file2, "open12.4.%d", getpid());
- SAFE_MKDIR(cleanup, file1, 00700);
+ umask(0);
+ fd = SAFE_CREAT(TESTFILE, 0644);
+ SAFE_CLOSE(fd);
+ SAFE_MKDIR(TESTDIR, 0755);
- SAFE_SYMLINK(cleanup, file1, file2);
+ SAFE_SYMLINK(TESTFILE, SYMFILE1);
+ SAFE_SYMLINK(SYMFILE1, SYMFILE2);
+ SAFE_SYMLINK(TESTDIR, SYMDIR1);
+ SAFE_SYMLINK(SYMDIR1, SYMDIR2);
- strcpy(TC[4].filename, file2);
- strcat(TC[4].filename, "/");
+ fd = SAFE_CREAT(PASSFILE, 0644);
+ SAFE_CLOSE(fd);
}
-static void setup(void)
+static void run(unsigned int n)
{
- umask(0);
+ const struct testcase *tc = testcase_list + n;
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
+ TST_RET = -1;
- TEST_PAUSE;
+ if (tc->err) {
+ TST_EXP_FAIL2(open(tc->path, O_NOFOLLOW | O_RDONLY), tc->err,
+ "%s", tc->desc);
+ } else {
+ TST_EXP_FD(open(tc->path, O_NOFOLLOW | O_RDONLY),
+ "%s", tc->desc);
+ }
- tst_tmpdir();
+ if (TST_RET >= 0)
+ SAFE_CLOSE(TST_RET);
}
-static void cleanup(void)
-{
- close(fd1);
- close(fd2);
-
- tst_rmdir();
-}
+static struct tst_test test = {
+ .setup = setup,
+ .test = run,
+ .tcnt = ARRAY_SIZE(testcase_list),
+ .needs_tmpdir = 1
+};
--
2.42.1
More information about the ltp
mailing list