* [LTP] [PATCH 1/3 v2] syscalls/chown: Rewrite chown/chown02.c with the new api
2021-04-30 9:45 [LTP] [PATCH 0/3 v2] syscalls/chown: Rewrite chown/chown{02, 04, 05} with the new api Xie Ziyao
@ 2021-04-30 9:45 ` Xie Ziyao
2021-05-03 14:15 ` Cyril Hrubis
2021-04-30 9:45 ` [LTP] [PATCH 2/3 v2] syscalls/chown: Rewrite chown/chown04.c " Xie Ziyao
2021-04-30 9:45 ` [LTP] [PATCH 3/3 v2] syscalls/chown: Rewrite chown/chown05.c " Xie Ziyao
2 siblings, 1 reply; 9+ messages in thread
From: Xie Ziyao @ 2021-04-30 9:45 UTC (permalink / raw)
To: ltp
Cleanup and rewrite chown/chown02.c with the new api
Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
v1->v2:
1. Cleanup and delete unnecessary logic.
testcases/kernel/syscalls/chown/chown02.c | 307 ++++------------------
1 file changed, 51 insertions(+), 256 deletions(-)
diff --git a/testcases/kernel/syscalls/chown/chown02.c b/testcases/kernel/syscalls/chown/chown02.c
index a459f092b..0f374baaa 100644
--- a/testcases/kernel/syscalls/chown/chown02.c
+++ b/testcases/kernel/syscalls/chown/chown02.c
@@ -1,85 +1,27 @@
+// 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
*/
-/*
- * Test Name: chown02
- *
- * Test Description:
- * Verify that, when chown(2) invoked by super-user to change the owner and
- * group of a file specified by path to any numeric owner(uid)/group(gid)
- * values,
- * - clears setuid and setgid bits set on an executable file.
- * - preserves setgid bit set on a non-group-executable file.
- *
- * Expected Result:
- * chown(2) should return 0 and the ownership set on the file should match
- * the numeric values contained in owner and group respectively.
- *
- * 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>
- * chown02 [-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.
+/*\
+ * [Description]
*
+ * Verify that, when chown(2) invoked by super-user to change the owner and
+ * group of a file specified by path to any numeric owner(uid)/group(gid)
+ * values,
+ * - clears setuid and setgid bits set on an executable file
+ * - preserves setgid bit set on a non-group-executable file
*/
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "safe_macros.h"
-#include "compat_16.h"
+#include "tst_test.h"
+#include "compat_tst_16.h"
+#include "tst_safe_macros.h"
#define FILE_MODE (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
#define NEW_PERMS1 (S_IFREG|S_IRWXU|S_IRWXG|S_ISUID|S_ISGID)
@@ -88,196 +30,49 @@
#define TESTFILE1 "testfile1"
#define TESTFILE2 "testfile2"
-TCID_DEFINE(chown02);
-
-int setup1(); /* Test specific setup functions */
-int setup2();
-
struct test_case_t {
- char *pathname;
- uid_t user_id;
- gid_t group_id;
- int test_flag;
- int (*setupfunc) ();
-} test_cases[] = {
- /* setuid/setgid bits cleared */
- {
- TESTFILE1, 700, 701, 1, setup1},
- /* setgid bit not cleared */
- {
-TESTFILE2, 700, 701, 2, setup2},};
-
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-void setup(); /* setup function for the test */
-void cleanup(); /* cleanup function for the test */
-
-int main(int ac, char **av)
-{
- struct stat stat_buf; /* stat(2) struct contents */
- int lc;
- int i;
- uid_t user_id; /* user id of the user set for testfile */
- gid_t group_id; /* group id of the user set for testfile */
- int test_flag; /* test condition specific flag variable */
- char *file_name; /* ptr. for test file name */
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- for (i = 0; i < TST_TOTAL; i++) {
-
- file_name = test_cases[i].pathname;
- user_id = test_cases[i].user_id;
- group_id = test_cases[i].group_id;
- test_flag = test_cases[i].test_flag;
-
- /*
- * Call chown(2) with different user id and
- * group id (numeric values) to set it on testfile.
- */
- TEST(CHOWN(cleanup, file_name, user_id, group_id));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL | TTERRNO,
- "chown(%s, ..) failed", file_name);
- continue;
- }
-
- /*
- * Get the testfile information using stat(2).
- */
- if (stat(file_name, &stat_buf) < 0) {
- tst_brkm(TFAIL, cleanup, "stat(2) of "
- "%s failed, errno:%d",
- file_name, TEST_ERRNO);
- }
-
- /*
- * Check for expected Ownership ids
- * set on testfile.
- */
- if (stat_buf.st_uid != user_id ||
- stat_buf.st_gid != group_id) {
- tst_brkm(TFAIL, cleanup, "%s: incorrect"
- " ownership set, Expected %d "
- "%d", file_name,
- user_id, group_id);
- }
-
- /*
- * Verify that S_ISUID/S_ISGID bits set on the
- * testfile(s) in setup()s are cleared by
- * chown().
- */
- if (test_flag == 1 &&
- (stat_buf.st_mode & (S_ISUID | S_ISGID)) != 0) {
- tst_resm(TFAIL,
- "%s: incorrect mode "
- "permissions %#o, Expected "
- "%#o", file_name, NEW_PERMS1,
- EXP_PERMS);
- } else if (test_flag == 2
- && (stat_buf.st_mode & S_ISGID) == 0) {
- tst_resm(TFAIL,
- "%s: Incorrect mode "
- "permissions %#o, Expected "
- "%#o", file_name,
- stat_buf.st_mode, NEW_PERMS2);
- } else {
- tst_resm(TPASS,
- "chown(%s, ..) succeeded",
- file_name);
- }
- }
- }
-
- cleanup();
- tst_exit();
-}
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- * Create a temporary directory and change directory to it.
- * Create a test file under temporary directory and close it
- */
-void setup(void)
+ const char *filename;
+ mode_t mode;
+} tc[] = {
+ {TESTFILE1, EXP_PERMS},
+ {TESTFILE2, NEW_PERMS2}
+};
+
+static void run(unsigned int i)
{
- int i;
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- tst_require_root();
-
- TEST_PAUSE;
-
- tst_tmpdir();
-
- /* call iividual setup functions */
- for (i = 0; i < TST_TOTAL; i++)
- test_cases[i].setupfunc();
+ uid_t uid;
+ gid_t gid;
+ UID16_CHECK((uid = geteuid()), "chown");
+ GID16_CHECK((gid = getegid()), "chown");
+
+ TST_EXP_PASS(CHOWN(tc[i].filename, uid, gid));
+
+ struct stat stat_buf;
+ SAFE_STAT(tc[i].filename, &stat_buf);
+ if (stat_buf.st_uid != uid || stat_buf.st_gid != gid)
+ tst_res(TFAIL, "%s: wrong owner set to (uid=%d, gid=%d),"
+ " expected (uid=%d, gid=%d)",
+ tc[i].filename, stat_buf.st_uid, stat_buf.st_gid, uid, gid);
+ if (stat_buf.st_mode != tc[i].mode)
+ tst_res(TFAIL, "%s: wrong mode permissions %#o, expected %#o",
+ tc[i].filename, stat_buf.st_mode, tc[i].mode);
}
-/*
- * int
- * setup1() - Setup function for chown(2) to verify setuid/setgid bits
- * set on an executable file will not be cleared.
- * Creat a testfile and set setuid/setgid bits on the mode of file.$
- */
-int setup1(void)
+static void setup(void)
{
- int fd; /* File descriptor for testfile1 */
+ int fd = SAFE_OPEN(TESTFILE1, O_RDWR | O_CREAT, FILE_MODE);
+ SAFE_CLOSE(fd);
+ SAFE_CHMOD(TESTFILE1, NEW_PERMS1);
- /* Creat a testfile and close it */
- if ((fd = open(TESTFILE1, O_RDWR | O_CREAT, FILE_MODE)) == -1)
- tst_brkm(TBROK | TERRNO, cleanup,
- "open(%s, O_RDWR|O_CREAT, %o) failed",
- TESTFILE1, FILE_MODE);
- SAFE_CLOSE(cleanup, fd);
-
- /* Set setuid/setgid bits on the test file created */
- SAFE_CHMOD(cleanup, TESTFILE1, NEW_PERMS1);
- return 0;
-}
-
-/*
- * int
- * setup2() - Setup function for chown(2) to verify setgid bit set
- * set on non-group executable file will not be cleared.
- * Creat a testfile and set setgid bit on the mode of file.
- */
-int setup2(void)
-{
- int fd; /* File descriptor for testfile2 */
-
- /* Creat a testfile and close it */
- if ((fd = open(TESTFILE2, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
- tst_brkm(TBROK | TERRNO, cleanup,
- "open(%s, O_RDWR|O_CREAT, %o) failed",
- TESTFILE2, FILE_MODE);
- }
- /* Set setgid bit on the test file created */
- if (fchmod(fd, NEW_PERMS2) != 0)
- tst_brkm(TBROK | TERRNO, cleanup, "fchmod failed");
- SAFE_CLOSE(cleanup, fd);
- return 0;
+ fd = SAFE_OPEN(TESTFILE2, O_RDWR | O_CREAT, FILE_MODE);
+ SAFE_CLOSE(fd);
+ SAFE_CHMOD(TESTFILE2, NEW_PERMS2);
}
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- * Remove the test directory and testfile created in the setup.
- */
-void cleanup(void)
-{
-
- tst_rmdir();
-
-}
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tc),
+ .needs_root = 1,
+ .needs_tmpdir = 1,
+ .setup = setup,
+ .test = run,
+};
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [LTP] [PATCH 2/3 v2] syscalls/chown: Rewrite chown/chown04.c with the new api
2021-04-30 9:45 [LTP] [PATCH 0/3 v2] syscalls/chown: Rewrite chown/chown{02, 04, 05} with the new api Xie Ziyao
2021-04-30 9:45 ` [LTP] [PATCH 1/3 v2] syscalls/chown: Rewrite chown/chown02.c " Xie Ziyao
@ 2021-04-30 9:45 ` Xie Ziyao
2021-05-03 14:16 ` Cyril Hrubis
2021-04-30 9:45 ` [LTP] [PATCH 3/3 v2] syscalls/chown: Rewrite chown/chown05.c " Xie Ziyao
2 siblings, 1 reply; 9+ messages in thread
From: Xie Ziyao @ 2021-04-30 9:45 UTC (permalink / raw)
To: ltp
1. Rewrite chown/chown04.c with the new api;
2. Add MAP_PRIVATE_EXCEPT_UCLINUX to SAFE_MMAP() for uClinux systems:
mmap() doesn't support MAP_PRIVATE on uClinux systems, so use
MAP_PRIVATE_EXCEPT_UCLINUX instead, which will skip the option on uClinux.
If MAP_PRIVATE really is required, the test can not be run on uClinux.
Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
v1->v2:
1. Cleanup and delete unnecessary logic.
include/tst_safe_macros.h | 12 ++
testcases/kernel/syscalls/chown/chown04.c | 229 +++++++---------------
2 files changed, 85 insertions(+), 156 deletions(-)
diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h
index b9d9baa1a..ea4db2cd1 100644
--- a/include/tst_safe_macros.h
+++ b/include/tst_safe_macros.h
@@ -240,6 +240,18 @@ static inline void *safe_mmap(const char *file, const int lineno,
return rval;
}
+
+/*
+ * mmap() doesn't support MAP_PRIVATE on uClinux systems, so use
+ * MAP_PRIVATE_EXCEPT_UCLINUX instead, which will skip the option on uClinux.
+ * If MAP_PRIVATE really is required, the test can not be run on uClinux.
+ */
+#ifdef UCLINUX
+# define MAP_PRIVATE_EXCEPT_UCLINUX 0
+#else
+# define MAP_PRIVATE_EXCEPT_UCLINUX MAP_PRIVATE
+#endif
+
#define SAFE_MMAP(addr, length, prot, flags, fd, offset) \
safe_mmap(__FILE__, __LINE__, (addr), (length), (prot), \
(flags), (fd), (offset))
diff --git a/testcases/kernel/syscalls/chown/chown04.c b/testcases/kernel/syscalls/chown/chown04.c
index 1f3ed412b..7fbcd5f0a 100644
--- a/testcases/kernel/syscalls/chown/chown04.c
+++ b/testcases/kernel/syscalls/chown/chown04.c
@@ -1,75 +1,54 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) International Business Machines Corp., 2001
- * 07/2001 Ported by Wayne Boyer
+ * 07/2001 Ported by Wayne Boyer
* Copyright (c) 2014 Cyril Hrubis <chrubis@suse.cz>
- *
- * 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
*/
-/*
- * Test Name: chown04
+/*\
+ * [Description]
*
- * Test Description:
- * Verify that,
- * 1) chown(2) returns -1 and sets errno to EPERM if the effective user id
- * of process does not match the owner of the file and the process
- * is not super user.
- * 2) chown(2) returns -1 and sets errno to EACCES if search permission is
- * denied on a component of the path prefix.
- * 3) chown(2) returns -1 and sets errno to EFAULT if pathname points
- * outside user's accessible address space.
- * 4) chown(2) returns -1 and sets errno to ENAMETOOLONG if the pathname
- * component is too long.
- * 5) chown(2) returns -1 and sets errno to ENOTDIR if the directory
- * component in pathname is not a directory.
- * 6) chown(2) returns -1 and sets errno to ENOENT if the specified file
- * does not exists.
+ * Verify that,
+ * 1) chown(2) returns -1 and sets errno to EPERM if the effective user id
+ * of process does not match the owner of the file and the process is not
+ * super user
+ * 2) chown(2) returns -1 and sets errno to EACCES if search permission is
+ * denied on a component of the path prefix
+ * 3) chown(2) returns -1 and sets errno to EFAULT if pathname points outside
+ * user's accessible address space
+ * 4) chown(2) returns -1 and sets errno to ENAMETOOLONG if the pathname
+ * component is too long
+ * 5) chown(2) returns -1 and sets errno to ENOENT if the specified file does
+ * not exists
+ * 6) chown(2) returns -1 and sets errno to ENOTDIR if the directory component
+ * in pathname is not a directory
+ * 7) chown(2) returns -1 and sets errno to ELOOP if too many symbolic links
+ * were encountered in resolving pathname
+ * 8) chown(2) returns -1 and sets errno to EROFS if the named file resides on
+ * a read-only filesystem
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <grp.h>
#include <pwd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-
-#include "test.h"
-#include "safe_macros.h"
-#include "compat_16.h"
-
-#define MODE_RWX (S_IRWXU|S_IRWXG|S_IRWXO)
-#define FILE_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
-#define DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP| \
- S_IXGRP|S_IROTH|S_IXOTH)
-#define DIR_TEMP "testdir_1"
-#define TEST_FILE1 "tfile_1"
-#define TEST_FILE2 (DIR_TEMP "/tfile_2")
-#define TEST_FILE3 "t_file/tfile_3"
-#define TEST_FILE4 "test_eloop1"
-#define TEST_FILE5 "mntpoint"
-
-static char long_path[PATH_MAX + 2];
-static const char *device;
-static int mount_flag;
+
+#include "tst_test.h"
+#include "compat_tst_16.h"
+#include "tst_safe_macros.h"
+
+#define MODE 0666
+
+#define MNT_POINT "mntpoint"
+#define MODE_RWX (S_IRWXU|S_IRWXG|S_IRWXO)
+#define FILE_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
+#define DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
+
+#define DIR_TEMP "testdir_1"
+#define TEST_FILE1 "tfile_1"
+#define TEST_FILE2 "testdir_1/tfile_2"
+#define TEST_FILE3 "t_file/tfile_3"
+#define TEST_FILE4 "test_eloop1"
+#define TEST_FILE5 "mntpoint"
+
+static char long_path[PATH_MAX + 2] = {[0 ... PATH_MAX + 1] = 'a'};
static struct test_case_t {
char *pathname;
@@ -85,111 +64,49 @@ static struct test_case_t {
{TEST_FILE5, EROFS}
};
-TCID_DEFINE(chown04);
-int TST_TOTAL = ARRAY_SIZE(tc);
-
-static char *bad_addr;
+static void run(unsigned int i)
+{
+ uid_t uid;
+ gid_t gid;
-static void setup(void);
-static void cleanup(void);
+ UID16_CHECK((uid = geteuid()), "chown");
+ GID16_CHECK((gid = getegid()), "chown");
-int main(int ac, char **av)
-{
- int lc;
- int i;
- uid_t user_id;
- gid_t group_id;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- UID16_CHECK((user_id = geteuid()), "chown", cleanup)
- GID16_CHECK((group_id = getegid()), "chown", cleanup)
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- tst_count = 0;
-
- for (i = 0; i < TST_TOTAL; i++) {
- TEST(CHOWN(cleanup, tc[i].pathname, user_id, group_id));
-
- if (TEST_RETURN == 0) {
- tst_resm(TFAIL, "chown succeeded unexpectedly");
- continue;
- }
-
- if (TEST_ERRNO == tc[i].exp_errno) {
- tst_resm(TPASS | TTERRNO, "chown failed");
- } else {
- tst_resm(TFAIL | TTERRNO,
- "chown failed; expected: %d - %s",
- tc[i].exp_errno,
- tst_strerrno(tc[i].exp_errno));
- }
- }
- }
-
- cleanup();
- tst_exit();
+ TST_EXP_FAIL(CHOWN(tc[i].pathname, uid, gid), tc[i].exp_errno);
}
static void setup(void)
{
struct passwd *ltpuser;
- const char *fs_type;
-
- tst_require_root();
- tst_sig(FORK, DEF_HANDLER, cleanup);
- ltpuser = SAFE_GETPWNAM(NULL, "nobody");
+ ltpuser = SAFE_GETPWNAM("nobody");
- tst_tmpdir();
+ tc[2].pathname = SAFE_MMAP(0, 1, PROT_NONE,
+ MAP_PRIVATE_EXCEPT_UCLINUX | MAP_ANONYMOUS,
+ 0, 0);
- fs_type = tst_dev_fs_type();
- device = tst_acquire_device(cleanup);
- if (!device)
- tst_brkm(TCONF, cleanup, "Failed to obtain block device");
+ SAFE_SYMLINK("test_eloop1", "test_eloop2");
+ SAFE_SYMLINK("test_eloop2", "test_eloop1");
- tst_mkfs(cleanup, device, fs_type, NULL, NULL);
+ SAFE_SETEUID(0);
+ SAFE_TOUCH("t_file", MODE_RWX, NULL);
+ SAFE_TOUCH(TEST_FILE1, MODE, NULL);
+ SAFE_MKDIR(DIR_TEMP, S_IRWXU);
+ SAFE_TOUCH(TEST_FILE2, MODE, NULL);
- TEST_PAUSE;
-
- memset(long_path, 'a', PATH_MAX - 1);
-
- bad_addr = mmap(0, 1, PROT_NONE,
- MAP_PRIVATE_EXCEPT_UCLINUX | MAP_ANONYMOUS, 0, 0);
- if (bad_addr == MAP_FAILED)
- tst_brkm(TBROK | TERRNO, cleanup, "mmap failed");
-
- tc[2].pathname = bad_addr;
-
- SAFE_SYMLINK(cleanup, "test_eloop1", "test_eloop2");
- SAFE_SYMLINK(cleanup, "test_eloop2", "test_eloop1");
-
- SAFE_SETEUID(cleanup, 0);
- SAFE_TOUCH(cleanup, "t_file", MODE_RWX, NULL);
- SAFE_TOUCH(cleanup, TEST_FILE1, 0666, NULL);
- SAFE_MKDIR(cleanup, DIR_TEMP, S_IRWXU);
- SAFE_TOUCH(cleanup, TEST_FILE2, 0666, NULL);
-
- SAFE_MKDIR(cleanup, "mntpoint", DIR_MODE);
- SAFE_MOUNT(cleanup, device, "mntpoint", fs_type, MS_RDONLY, NULL);
- mount_flag = 1;
-
- SAFE_SETEUID(cleanup, ltpuser->pw_uid);
+ SAFE_SETEUID(ltpuser->pw_uid);
}
-void cleanup(void)
+static void cleanup(void)
{
- if (seteuid(0) == -1)
- tst_resm(TWARN | TERRNO, "seteuid(0) failed");
-
- if (mount_flag && tst_umount("mntpoint") < 0) {
- tst_brkm(TBROK | TERRNO, NULL,
- "umount device:%s failed", device);
- }
-
- if (device)
- tst_release_device(device);
-
- tst_rmdir();
+ SAFE_SETEUID(0);
}
+
+static struct tst_test test = {
+ .needs_root = 1,
+ .needs_rofs = 1,
+ .mntpoint = MNT_POINT,
+ .tcnt = ARRAY_SIZE(tc),
+ .test = run,
+ .setup = setup,
+ .cleanup = cleanup,
+};
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [LTP] [PATCH 3/3 v2] syscalls/chown: Rewrite chown/chown05.c with the new api
2021-04-30 9:45 [LTP] [PATCH 0/3 v2] syscalls/chown: Rewrite chown/chown{02, 04, 05} with the new api Xie Ziyao
2021-04-30 9:45 ` [LTP] [PATCH 1/3 v2] syscalls/chown: Rewrite chown/chown02.c " Xie Ziyao
2021-04-30 9:45 ` [LTP] [PATCH 2/3 v2] syscalls/chown: Rewrite chown/chown04.c " Xie Ziyao
@ 2021-04-30 9:45 ` Xie Ziyao
2021-05-03 16:33 ` Cyril Hrubis
2 siblings, 1 reply; 9+ messages in thread
From: Xie Ziyao @ 2021-04-30 9:45 UTC (permalink / raw)
To: ltp
1. Rewrite chown/chown05.c with the new api;
2. Remove duplicate test points.
Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
v1->v2:
1. Cleanup and delete unnecessary logic.
testcases/kernel/syscalls/chown/chown05.c | 195 +++++-----------------
1 file changed, 39 insertions(+), 156 deletions(-)
diff --git a/testcases/kernel/syscalls/chown/chown05.c b/testcases/kernel/syscalls/chown/chown05.c
index 47510ee9a..2de09d913 100644
--- a/testcases/kernel/syscalls/chown/chown05.c
+++ b/testcases/kernel/syscalls/chown/chown05.c
@@ -1,173 +1,56 @@
+// 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
*/
-/*
- * Test Name: chown05
- *
- * Test Description:
- * Verify that, chown(2) succeeds to change the owner and group of a file
- * specified by path to any numeric owner(uid)/group(gid) values when invoked
- * by super-user.
- *
- * Expected Result:
- * chown(2) should return 0 and the ownership set on the file should match
- * the numeric values contained in owner and group respectively.
- *
- * Algorithm:
- * Setup:
- * Setup signal handling.
- * Create temporary directory.
- * Pause for SIGUSR1 if option specified.
+/*\
+ * [Description]
*
- * 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>
- * chown05 [-c n] [-e] [-f] [-i n] [-I x] [-P x] [-t]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.
- * -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.
+ * Verify that, chown(2) succeeds to change the owner and group of a file
+ * specified by path to any numeric owner(uid)/group(gid) values when invoked
+ * by super-user.
*/
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "safe_macros.h"
-#include "compat_16.h"
+#include "tst_test.h"
+#include "compat_tst_16.h"
+#include "tst_safe_macros.h"
-#define FILE_MODE (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
-#define TESTFILE "testfile"
-
-TCID_DEFINE(chown05);
+#define FILE_MODE (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
+#define TESTFILE "testfile"
struct test_case_t {
- uid_t user_id;
- gid_t group_id;
-} test_cases[] = {
- {
- 700, 701}, {
- 702, -1}, {
- 703, 701}, {
- -1, 704}, {
-703, 705},};
-
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-void setup(); /* setup function for the test */
-void cleanup(); /* cleanup function for the test */
-
-int main(int ac, char **av)
+ uid_t uid;
+ gid_t gid;
+} tc[] = {
+ {700, 701},
+ {702, 701},
+ {702, 703},
+ {704, 705}
+};
+
+static void run(unsigned int i)
{
- struct stat stat_buf; /* stat(2) struct contents */
- int lc;
- int i;
- uid_t user_id; /* user id of the user set for testfile */
- gid_t group_id; /* group id of the user set for testfile */
+ struct stat stat_buf;
+ TST_EXP_PASS(CHOWN(TESTFILE, tc[i].uid, tc[i].gid));
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- for (i = 0; i < TST_TOTAL; i++) {
- user_id = test_cases[i].user_id;
- group_id = test_cases[i].group_id;
-
- TEST(CHOWN(cleanup, TESTFILE, user_id, group_id));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL | TTERRNO, "chown failed");
- continue;
- }
- if (stat(TESTFILE, &stat_buf) == -1)
- tst_brkm(TFAIL, cleanup, "stat failed");
- if ((int)user_id == -1)
- user_id = test_cases[i - 1].user_id;
- if ((int)group_id == -1)
- group_id = test_cases[i - 1].group_id;
-
- if (stat_buf.st_uid != user_id ||
- stat_buf.st_gid != group_id)
- tst_resm(TFAIL, "%s: incorrect "
- "ownership set, Expected %d "
- "%d", TESTFILE, user_id,
- group_id);
- else
- tst_resm(TPASS, "chown succeeded");
- }
- }
-
- cleanup();
- tst_exit();
+ SAFE_STAT(TESTFILE, &stat_buf);
+ if (stat_buf.st_uid != tc[i].uid || stat_buf.st_gid != tc[i].gid)
+ tst_res(TFAIL, "%s: incorrect ownership set, expected %d %d",
+ TESTFILE, tc[i].uid, tc[i].gid);
}
-void setup(void)
+static void setup(void)
{
int fd;
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- tst_require_root();
-
- TEST_PAUSE;
-
- tst_tmpdir();
-
- if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1)
- tst_brkm(TBROK | TERRNO, cleanup, "opening %s failed",
- TESTFILE);
- SAFE_CLOSE(cleanup, fd);
-
+ fd = SAFE_OPEN(TESTFILE, O_RDWR | O_CREAT, FILE_MODE);
+ SAFE_CLOSE(fd);
}
-void cleanup(void)
-{
- tst_rmdir();
-}
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tc),
+ .needs_root = 1,
+ .needs_tmpdir = 1,
+ .setup = setup,
+ .test = run,
+};
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread