[LTP] [PATCH v2 1/1] mknod01: Rewrite the test using new LTP API
Avinesh Kumar
akumar@suse.de
Tue Feb 28 16:42:03 CET 2023
Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
testcases/kernel/syscalls/mknod/mknod01.c | 137 +++-------
testcases/kernel/syscalls/mknod/mknod02.c | 312 +++-------------------
2 files changed, 76 insertions(+), 373 deletions(-)
diff --git a/testcases/kernel/syscalls/mknod/mknod01.c b/testcases/kernel/syscalls/mknod/mknod01.c
index f79e5fa42..7a4d5b43f 100644
--- a/testcases/kernel/syscalls/mknod/mknod01.c
+++ b/testcases/kernel/syscalls/mknod/mknod01.c
@@ -1,123 +1,50 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
- * AUTHOR : William Roske
- * CO-PILOT : Dave Fenner
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like. Any license provided herein, whether implied or
- * otherwise, applies only to this software file. Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA 94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
+ * AUTHOR: William Roske, CO-PILOT: Dave Fenner
+ * Copyright (c) 2023 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
+ */
+
+/*\
+ * [Description]
*
+ * Verify that mknod(2) successfully creates a filesystem node with
+ * various modes.
*/
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/sysmacros.h>
-
-#include "test.h"
-#include "safe_macros.h"
-
-static void setup(void);
-static void cleanup(void);
-
-char *TCID = "mknod01";
+#include "tst_test.h"
#define PATH "test_node"
-int tcases[] = { /* modes to give nodes created (1 per text case) */
- S_IFREG | 0777, /* ordinary file with mode 0777 */
- S_IFIFO | 0777, /* fifo special with mode 0777 */
- S_IFCHR | 0777, /* character special with mode 0777 */
- S_IFBLK | 0777, /* block special with mode 0777 */
+static int tcases[] = {
+ S_IFREG | 0777,
+ S_IFIFO | 0777,
+ S_IFCHR | 0777,
+ S_IFBLK | 0777,
- S_IFREG | 04700, /* ordinary file with mode 04700 (suid) */
- S_IFREG | 02700, /* ordinary file with mode 02700 (sgid) */
- S_IFREG | 06700, /* ordinary file with mode 06700 (sgid & suid) */
+ S_IFREG | 04700,
+ S_IFREG | 02700,
+ S_IFREG | 06700,
};
-int TST_TOTAL = ARRAY_SIZE(tcases);
-int main(int ac, char **av)
+static void run(unsigned int i)
{
- int lc, i;
- dev_t dev;
-
- tst_parse_opts(ac, av, NULL, NULL);
+ dev_t dev = 0;
- setup();
+ if (S_ISCHR(tcases[i]) || S_ISBLK(tcases[i]))
+ dev = makedev(1, 3);
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- tst_count = 0;
-
- for (i = 0; i < TST_TOTAL; i++) {
- /*
- * overlayfs doesn't support mknod char device with
- * major 0 and minor 0, which is known as whiteout_dev
- */
- if (S_ISCHR(tcases[i]))
- dev = makedev(1, 3);
- else
- dev = 0;
- TEST(mknod(PATH, tcases[i], dev));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL,
- "mknod(%s, %#o, %lu) failed, errno=%d : %s",
- PATH, tcases[i], dev, TEST_ERRNO,
- strerror(TEST_ERRNO));
- } else {
- tst_resm(TPASS,
- "mknod(%s, %#o, %lu) returned %ld",
- PATH, tcases[i], dev, TEST_RETURN);
- }
-
- SAFE_UNLINK(cleanup, PATH);
- }
-
- }
-
- cleanup();
- tst_exit();
+ TST_EXP_PASS(mknod(PATH, tcases[i], dev),
+ "mknod(PATH, %o, %ld)",
+ tcases[i], dev);
+ SAFE_UNLINK(PATH);
}
-void setup(void)
-{
- tst_require_root();
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
- tst_tmpdir();
-}
-
-void cleanup(void)
-{
- tst_rmdir();
-}
+static struct tst_test test = {
+ .test = run,
+ .tcnt = ARRAY_SIZE(tcases),
+ .needs_root = 1,
+ .needs_tmpdir = 1
+};
diff --git a/testcases/kernel/syscalls/mknod/mknod02.c b/testcases/kernel/syscalls/mknod/mknod02.c
index 594473e24..af63ad377 100644
--- a/testcases/kernel/syscalls/mknod/mknod02.c
+++ b/testcases/kernel/syscalls/mknod/mknod02.c
@@ -1,301 +1,77 @@
+// 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
+ * 07/2001 Ported by Wayne Boyer
+ * Copyright (c) 2023 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
*/
-/*
- * Test Name: mknod02
+/*\
+ * [Description]
*
- * Test Description:
* Verify that mknod(2) succeeds when used to create a filesystem
* node with set group-ID bit set on a directory without set group-ID bit set.
* The node created should have set group-ID bit set and its gid should be
* equal to that of its parent directory.
- *
- * Expected Result:
- * mknod() should return value 0 on success and node created should have
- * set group-ID bit set, its gid should be equal to that of its parent
- * directory.
- *
- * Algorithm:
- * Setup:
- * Setup signal handling.
- * Create temporary directory.
- * Pause for SIGUSR1 if option specified.
- *
- * Test:
- * Loop if the proper options are given.
- * Execute system call
- * Check return code, if system call failed (return=-1)
- * Log the errno and Issue a FAIL message.
- * Otherwise,
- * Verify the Functionality of system call
- * if successful,
- * Issue Functionality-Pass message.
- * Otherwise,
- * Issue Functionality-Fail message.
- * Cleanup:
- * Print errno log and/or timing stats if options given
- * Delete the temporary directory created.
- *
- * Usage: <for command-line>
- * mknod02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- * where, -c n : Run n copies concurrently.
- * -f : Turn off functionality Testing.
- * -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:
- * This test should be run by 'super-user' (root) only.
- *
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
#include <pwd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "safe_macros.h"
-
-#define LTPUSER "nobody"
-#define MODE_RWX S_IFIFO | S_IRWXU | S_IRWXG | S_IRWXO
-#define MODE_SGID S_IFIFO | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO
-#define DIR_TEMP "testdir_2"
-#define TNODE "tnode_%d"
+#include "tst_test.h"
-struct stat buf; /* struct. to hold stat(2) o/p contents */
-struct passwd *user1; /* struct. to hold getpwnam(3) o/p contents */
+#define MODE1 0010777 /* FIFO */
+#define MODE2 0012777 /* FIFO with Set group ID */
+#define DIR_TEMP "testdir"
+#define TEMP_NODE "node1"
-char *TCID = "mknod02";
-int TST_TOTAL = 1;
-char node_name[PATH_MAX]; /* buffer to hold node name created */
+static struct stat buf;
+static struct passwd *user_nobody;
-gid_t group1_gid, group2_gid, mygid; /* user and process group id's */
-uid_t save_myuid, user1_uid; /* user and process user id's */
-pid_t mypid; /* process id */
+static gid_t gid_nobody, egid_process, rgid_process;
+static uid_t ruid_process, uid_nobody;
-void setup(); /* setup function for the test */
-void cleanup(); /* cleanup function for the test */
-int main(int ac, char **av)
+static void setup(void)
{
- int lc;
- int fflag;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- /*
- * Attempt to create a filesystem node with group-id bit set
- * on a directory without group id bit set such that,
- * the node created by mknod(2) should have group-id (sgid)
- * bit set and node's gid should be equal to that of its
- * parent directory.
- */
- TEST(mknod(node_name, MODE_SGID, 0));
-
- /* Check return code from mknod(2) */
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL,
- "mknod(%s, %#o, 0) failed, errno=%d : %s",
- node_name, MODE_SGID, TEST_ERRNO,
- strerror(TEST_ERRNO));
- continue;
- }
- /* Set the functionality flag */
- fflag = 1;
-
- /* Check for node's creation */
- if (stat(node_name, &buf) < 0) {
- tst_resm(TFAIL, "stat() of %s failed, errno:%d",
- node_name, TEST_ERRNO);
-
- /* unset functionality flag */
- fflag = 0;
- }
+ SAFE_CHMOD(".", 0711);
- /* Verify mode permissions of node */
- if (!(buf.st_mode & S_ISGID)) {
- tst_resm(TFAIL, "%s: Incorrect modes, setgid "
- "bit not set", node_name);
- /* unset flag as functionality fails */
- fflag = 0;
- }
+ ruid_process = getuid();
+ user_nobody = SAFE_GETPWNAM("nobody");
+ uid_nobody = user_nobody->pw_uid;
+ gid_nobody = user_nobody->pw_gid;
- /* Verify group ID of node */
- if (buf.st_gid != mygid) {
- tst_resm(TFAIL, "%s: Incorrect group",
- node_name);
- /* unset flag as functionality fails */
- fflag = 0;
- }
- if (fflag) {
- tst_resm(TPASS, "Functionality of mknod(%s, "
- "%#o, 0) successful",
- node_name, MODE_SGID);
- }
+ egid_process = getegid();
- /* Remove the node for the next go `round */
- if (unlink(node_name) == -1) {
- tst_resm(TWARN, "unlink(%s) failed, errno:%d %s",
- node_name, errno, strerror(errno));
- }
- }
+ SAFE_MKDIR(DIR_TEMP, MODE1);
+ SAFE_CHOWN(DIR_TEMP, uid_nobody, egid_process);
- /* Change the directory back to temporary directory */
- SAFE_CHDIR(cleanup, "..");
+ SAFE_SETGID(gid_nobody);
+ SAFE_SETREUID(-1, uid_nobody);
- /*
- * Invoke cleanup() to delete the test directories created
- * in the setup() and exit main().
- */
- cleanup();
-
- tst_exit();
+ rgid_process = getgid();
}
-/*
- * setup(void) - performs all ONE TIME setup for this test.
- * Exit the test program on receipt of unexpected signals.
- * Create a temporary directory used to hold test directories created
- * and change the directory to it.
- * Verify that pid of process executing the test is root.
- * Create a test directory on temporary directory and set the ownership
- * of test directory to ltp user and process.
- * Set the effective uid/gid of the process to that of ltp user.
- */
-void setup(void)
+static void run(void)
{
- tst_require_root();
-
- /* Capture unexpected signals */
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
- /* Make a temp dir and cd to it */
- tst_tmpdir();
-
- /* fix permissions on the tmpdir */
- if (chmod(".", 0711) != 0) {
- tst_brkm(TBROK, cleanup, "chmod() failed");
- }
-
- /* Save the real user id of the current test process */
- save_myuid = getuid();
-
- /* Save the process id of the current test process */
- mypid = getpid();
-
- /* Get the node name to be created in the test */
- sprintf(node_name, TNODE, mypid);
-
- /* Get the uid/gid of ltpuser */
- if ((user1 = getpwnam(LTPUSER)) == NULL) {
- tst_brkm(TBROK | TERRNO, cleanup,
- "Couldn't determine if %s was in /etc/passwd",
- LTPUSER);
- }
- user1_uid = user1->pw_uid;
- group1_gid = user1->pw_gid;
+ SAFE_CHDIR(DIR_TEMP);
+ TST_EXP_PASS(mknod(TEMP_NODE, MODE2, 0), "mknod(%s, %o, 0)", TEMP_NODE, MODE2);
- /* Get the effective group id of the test process */
- group2_gid = getegid();
+ TST_EXP_PASS_SILENT(stat(TEMP_NODE, &buf));
- /*
- * Create a test directory under temporary directory with the
- * specified mode permissions, with uid/gid set to that of guest
- * user and the test process.
- */
- SAFE_MKDIR(cleanup, DIR_TEMP, MODE_RWX);
- SAFE_CHOWN(cleanup, DIR_TEMP, user1_uid, group2_gid);
+ TST_EXP_EQ_LI(buf.st_mode & S_ISGID, S_ISGID);
+ TST_EXP_EQ_LI(buf.st_gid, rgid_process);
- /*
- * Verify that test directory created with expected permission modes
- * and ownerships.
- */
- SAFE_STAT(cleanup, DIR_TEMP, &buf);
-
- /* Verify modes of test directory */
- if (buf.st_mode & S_ISGID) {
- tst_brkm(TBROK, cleanup,
- "%s: Incorrect modes, setgid bit set", DIR_TEMP);
- }
-
- /* Verify group ID of test directory */
- if (buf.st_gid != group2_gid) {
- tst_brkm(TBROK, cleanup, "%s: Incorrect group", DIR_TEMP);
- }
-
- /*
- * Set the effective group id and user id of the test process
- * to that of guest user.
- */
- SAFE_SETGID(cleanup, group1_gid);
- if (setreuid(-1, user1_uid) < 0) {
- tst_brkm(TBROK, cleanup,
- "Unable to set process uid to that of ltp user");
- }
-
- /* Save the real group ID of the current process */
- mygid = getgid();
-
- /* Change directory to DIR_TEMP */
- SAFE_CHDIR(cleanup, DIR_TEMP);
+ SAFE_UNLINK(TEMP_NODE);
+ SAFE_CHDIR("..");
}
-/*
- * cleanup() - Performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- * Print test timing stats and errno log if test executed with options.
- * Restore the real/effective user id of the process changed during
- * setup().
- * Remove temporary directory and sub-directories/files under it
- * created during setup().
- * Exit the test program with normal exit code.
- */
-void cleanup(void)
+static void cleanup(void)
{
-
- /*
- * Restore the effective uid of the process changed in the
- * setup().
- */
- if (setreuid(-1, save_myuid) < 0) {
- tst_brkm(TBROK, NULL,
- "resetting process real/effective uid failed");
- }
-
- tst_rmdir();
-
+ SAFE_SETREUID(-1, ruid_process);
}
+
+static struct tst_test test = {
+ .setup = setup,
+ .cleanup = cleanup,
+ .test_all = run,
+ .needs_tmpdir = 1,
+ .needs_root = 1
+};
--
2.39.2
More information about the ltp
mailing list