* [LTP] [PATCH 1/2] syscalls/chown: rewrite chown/chown01.c with the new api
@ 2021-03-26 3:12 Xie Ziyao
2021-03-26 3:12 ` [LTP] [PATCH 2/2] syscalls/chown: rewrite chown/chown03.c " Xie Ziyao
2021-04-14 14:11 ` [LTP] [PATCH 1/2] syscalls/chown: rewrite chown/chown01.c " Alexey Kodanev
0 siblings, 2 replies; 5+ messages in thread
From: Xie Ziyao @ 2021-03-26 3:12 UTC (permalink / raw)
To: ltp
For this:
testcases/kernel/syscalls/chown/chown01.c
Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
testcases/kernel/syscalls/chown/chown01.c | 189 +++++-----------------
1 file changed, 36 insertions(+), 153 deletions(-)
diff --git a/testcases/kernel/syscalls/chown/chown01.c b/testcases/kernel/syscalls/chown/chown01.c
index 2e42153d6..a263db1bc 100644
--- a/testcases/kernel/syscalls/chown/chown01.c
+++ b/testcases/kernel/syscalls/chown/chown01.c
@@ -1,179 +1,62 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * 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
*/
-/* $Id: chown01.c,v 1.6 2009/08/28 11:59:17 vapier Exp $ */
-/**********************************************************
- *
- * OS Test - Silicon Graphics, Inc.
- *
- * TEST IDENTIFIER : chown01
- *
- * EXECUTED BY : anyone
- *
- * TEST TITLE : Basic test for chown(2)
- *
- * PARENT DOCUMENT : usctpl01
- *
- * TEST CASE TOTAL : 1
- *
- * WALL CLOCK TIME : 1
- *
- * CPU TYPES : ALL
- *
- * AUTHOR : William Roske
- *
- * CO-PILOT : Dave Fenner
- *
- * DATE STARTED : 03/30/92
- *
- * INITIAL RELEASE : UNICOS 7.0
- *
- * TEST CASES
- *
- * 1.) chown(2) returns...(See Description)
- *
- * INPUT SPECIFICATIONS
- * The standard options for system call tests are accepted.
- * (See the parse_opts(3) man page).
- *
- * OUTPUT SPECIFICATIONS
- *$
- * DURATION
- * Terminates - with frequency and infinite modes.
- *
- * SIGNALS
- * Uses SIGUSR1 to pause before test if option set.
- * (See the parse_opts(3) man page).
- *
- * RESOURCES
- * None
- *
- * ENVIRONMENTAL NEEDS
- * No run-time environmental needs.
- *
- * SPECIAL PROCEDURAL REQUIREMENTS
- * None
- *
- * INTERCASE DEPENDENCIES
- * None
- *
- * DETAILED DESCRIPTION
- * This is a Phase I test for the chown(2) system call. It is intended
- * to provide a limited exposure of the system call, for now. It
- * should/will be extended when full functional tests are written for
- * chown(2).
- *
- * Setup:
- * Setup signal handling.
- * 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, Issue a PASS message.
+
+/*\
+ * [Description]
*
- * Cleanup:
- * Print errno log and/or timing stats if options given
+ * This is a Phase I test for the chown(2) system call. It is intended
+ * to provide a limited exposure of the system call, for now. It
+ * should/will be extended when full functional tests are written for
+ * chown(2).
*
+ * [Algorithm]
*
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
+ * - Execute system call
+ * - Check return code, if system call failed (return=-1)
+ * - Log the errno and Issue a FAIL message
+ * - Otherwise, Issue a PASS message
+ */
+#include <stdio.h>
#include <sys/types.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <signal.h>
-#include "test.h"
-#include "safe_macros.h"
-#include "compat_16.h"
-TCID_DEFINE(chown01);
-int TST_TOTAL = 1;
+#include "tst_test.h"
+#include "compat_tst_16.h"
char fname[255];
int uid, gid;
-static void setup(void);
-static void cleanup(void);
-
-int main(int ac, char **av)
+static void run(void)
{
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- TEST(CHOWN(cleanup, fname, uid, gid));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL | TTERRNO, "chown(%s, %d,%d) failed",
- fname, uid, gid);
- } else {
- tst_resm(TPASS, "chown(%s, %d,%d) returned %ld",
- fname, uid, gid, TEST_RETURN);
- }
-
- }
-
- cleanup();
- tst_exit();
+ TEST(CHOWN(fname, uid, gid));
+
+ if (TST_RET == -1)
+ tst_res(TFAIL | TTERRNO, "chown(%s, %d,%d) failed",
+ fname, uid, gid);
+ else
+ tst_res(TPASS, "chown(%s, %d,%d) returned %ld",
+ fname, uid, gid, TST_RET);
}
static void setup(void)
{
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
- tst_tmpdir();
-
- UID16_CHECK((uid = geteuid()), "chown", cleanup)
- GID16_CHECK((gid = getegid()), "chown", cleanup)
-
+ UID16_CHECK((uid = geteuid()), "chown");
+ GID16_CHECK((gid = getegid()), "chown");
sprintf(fname, "t_%d", getpid());
-
- SAFE_FILE_PRINTF(cleanup, fname, "davef");
+ SAFE_FILE_PRINTF(fname, "davef");
}
-static void cleanup(void)
-{
- tst_rmdir();
+static struct tst_test test = {
+ .needs_tmpdir = 1,
+ .setup = setup,
+ .test_all = run,
+};
-}
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [LTP] [PATCH 2/2] syscalls/chown: rewrite chown/chown03.c with the new api
2021-03-26 3:12 [LTP] [PATCH 1/2] syscalls/chown: rewrite chown/chown01.c with the new api Xie Ziyao
@ 2021-03-26 3:12 ` Xie Ziyao
2021-04-14 14:23 ` Alexey Kodanev
2021-04-14 14:11 ` [LTP] [PATCH 1/2] syscalls/chown: rewrite chown/chown01.c " Alexey Kodanev
1 sibling, 1 reply; 5+ messages in thread
From: Xie Ziyao @ 2021-03-26 3:12 UTC (permalink / raw)
To: ltp
For this:
testcases/kernel/syscalls/chown/chown03.c
Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
testcases/kernel/syscalls/chown/chown03.c | 232 +++++++---------------
1 file changed, 73 insertions(+), 159 deletions(-)
diff --git a/testcases/kernel/syscalls/chown/chown03.c b/testcases/kernel/syscalls/chown/chown03.c
index 2c7bcfe7d..dfab3691b 100644
--- a/testcases/kernel/syscalls/chown/chown03.c
+++ b/testcases/kernel/syscalls/chown/chown03.c
@@ -1,72 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
+ * Copyright (c) International Business Machines Corp., 2001
*
- * 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
*/
-/*
- * Test Name: chown03
- *
- * Test Description:
- * Verify that, chown(2) succeeds to change the group of a file specified
- * by path when called by non-root user with the following constraints,
- * - euid of the process is equal to the owner of the file.
- * - the intended gid is either egid, or one of the supplementary gids
- * of the process.
- * Also, verify that chown() clears the setuid/setgid bits set on the 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>
- * chown03 [-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.
+/*\
+ * [Description]
*
- * HISTORY
- * 07/2001 Ported by Wayne Boyer
+ * Verify that, chown(2) succeeds to change the group of a file specified
+ * by path when called by non-root user with the following constraints,
+ * - euid of the process is equal to the owner of the file.
+ * - the intended gid is either egid, or one of the supplementary gids
+ * of the process.
+ * Also, verify that chown() clears the setuid/setgid bits set on the file.
*
- * RESTRICTIONS:
+ * [Algorithm]
*
+ * - 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
*/
#include <stdio.h>
@@ -80,123 +39,78 @@
#include <grp.h>
#include <pwd.h>
-#include "test.h"
-#include "safe_macros.h"
-#include "compat_16.h"
+#include "tst_test.h"
+#include "compat_tst_16.h"
#define FILE_MODE (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
#define NEW_PERMS (S_IFREG|S_IRWXU|S_IRWXG|S_ISUID|S_ISGID)
#define TESTFILE "testfile"
-TCID_DEFINE(chown03);
-int TST_TOTAL = 1; /* Total number of test conditions */
-char nobody_uid[] = "nobody";
-struct passwd *ltpuser;
-
-void setup(); /* setup function for the test */
-void cleanup(); /* cleanup function for the test */
-
-int main(int ac, char **av)
+static void run(void)
{
struct stat stat_buf; /* stat(2) struct contents */
- int lc;
uid_t user_id; /* Owner id of the test file. */
gid_t group_id; /* Group id of the test file. */
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- UID16_CHECK((user_id = geteuid()), "chown", cleanup)
- GID16_CHECK((group_id = getegid()), "chown", cleanup)
-
- TEST(CHOWN(cleanup, TESTFILE, -1, group_id));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL | TTERRNO, "chown(%s, ..) failed",
- TESTFILE);
- continue;
- }
-
- if (stat(TESTFILE, &stat_buf) == -1)
- tst_brkm(TFAIL | TERRNO, cleanup,
- "stat failed");
-
- if (stat_buf.st_uid != user_id ||
- stat_buf.st_gid != group_id)
- tst_resm(TFAIL, "%s: Incorrect ownership"
- "set to %d %d, Expected %d %d",
- TESTFILE, stat_buf.st_uid,
- stat_buf.st_gid, user_id, group_id);
-
- if (stat_buf.st_mode !=
- (NEW_PERMS & ~(S_ISUID | S_ISGID)))
- tst_resm(TFAIL, "%s: incorrect mode permissions"
- " %#o, Expected %#o", TESTFILE,
- stat_buf.st_mode,
- NEW_PERMS & ~(S_ISUID | S_ISGID));
- else
- tst_resm(TPASS, "chown(%s, ..) was successful",
- TESTFILE);
- }
-
- cleanup();
- tst_exit();
+ UID16_CHECK((user_id = geteuid()), "chown");
+ GID16_CHECK((group_id = getegid()), "chown");
+
+ TEST(CHOWN(TESTFILE, -1, group_id));
+ if (TST_RET == -1)
+ tst_res(TFAIL | TTERRNO, "chown(%s, ..) failed",
+ TESTFILE);
+
+ SAFE_STAT(TESTFILE, &stat_buf);
+
+ if (stat_buf.st_uid != user_id || stat_buf.st_gid != group_id)
+ tst_res(TFAIL, "%s: Incorrect ownership"
+ "set to %d %d, Expected %d %d",
+ TESTFILE, stat_buf.st_uid,
+ stat_buf.st_gid, user_id, group_id);
+
+ if (stat_buf.st_mode != (NEW_PERMS & ~(S_ISUID | S_ISGID)))
+ tst_res(TFAIL, "%s: incorrect mode permissions"
+ " %#o, Expected %#o", TESTFILE,
+ stat_buf.st_mode,
+ NEW_PERMS & ~(S_ISUID | S_ISGID));
+ else
+ tst_res(TPASS, "chown(%s, ..) was successful",
+ TESTFILE);
}
-/*
- * 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
- * Change the group ownership on testfile.
- */
-void setup(void)
+static void setup(void)
{
- int fd; /* file handler for testfile */
-
- TEST_PAUSE;
-
- tst_require_root();
+ int fd; /* file handler for testfile */
+ struct passwd *ltpuser;
- tst_sig(FORK, DEF_HANDLER, cleanup);
-
- tst_tmpdir();
-
- ltpuser = getpwnam(nobody_uid);
+ ltpuser = SAFE_GETPWNAM("nobody");
if (ltpuser == NULL)
- tst_brkm(TBROK | TERRNO, NULL, "getpwnam(\"nobody\") failed");
- SAFE_SETEGID(NULL, ltpuser->pw_gid);
- SAFE_SETEUID(NULL, ltpuser->pw_uid);
+ tst_brk(TBROK | TTERRNO,
+ "getpwnam(\"nobody\") failed");
+ SAFE_SETEGID(ltpuser->pw_gid);
+ SAFE_SETEUID(ltpuser->pw_uid);
/* Create a test file under temporary directory */
- if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1)
- tst_brkm(TBROK | TERRNO, cleanup,
- "open(%s, O_RDWR|O_CREAT, %o) failed", TESTFILE,
- FILE_MODE);
-
- SAFE_SETEUID(cleanup, 0);
-
- SAFE_FCHOWN(cleanup, fd, -1, 0);
+ fd = SAFE_OPEN(TESTFILE, O_RDWR | O_CREAT, FILE_MODE);
- SAFE_FCHMOD(cleanup, fd, NEW_PERMS);
-
- SAFE_SETEUID(cleanup, ltpuser->pw_uid);
-
- SAFE_CLOSE(cleanup, fd);
+ SAFE_SETEUID(0);
+ SAFE_FCHOWN(fd, -1, 0);
+ SAFE_FCHMOD(fd, NEW_PERMS);
+ SAFE_SETEUID(ltpuser->pw_uid);
+ SAFE_CLOSE(fd);
}
-void cleanup(void)
+static void cleanup(void)
{
- if (setegid(0) == -1)
- tst_resm(TWARN | TERRNO, "setegid(0) failed");
- if (seteuid(0) == -1)
- tst_resm(TWARN | TERRNO, "seteuid(0) failed");
+ SAFE_SETEGID(0);
+ SAFE_SETEUID(0);
+}
- tst_rmdir();
+static struct tst_test test = {
+ .needs_root = 1,
+ .needs_tmpdir = 1,
+ .setup = setup,
+ .cleanup = cleanup,
+ .test_all = run,
+};
-}
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [LTP] [PATCH 1/2] syscalls/chown: rewrite chown/chown01.c with the new api
2021-03-26 3:12 [LTP] [PATCH 1/2] syscalls/chown: rewrite chown/chown01.c with the new api Xie Ziyao
2021-03-26 3:12 ` [LTP] [PATCH 2/2] syscalls/chown: rewrite chown/chown03.c " Xie Ziyao
@ 2021-04-14 14:11 ` Alexey Kodanev
1 sibling, 0 replies; 5+ messages in thread
From: Alexey Kodanev @ 2021-04-14 14:11 UTC (permalink / raw)
To: ltp
On 26.03.2021 06:12, Xie Ziyao wrote:
> For this:
> testcases/kernel/syscalls/chown/chown01.c
>
> Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
> ---
> testcases/kernel/syscalls/chown/chown01.c | 189 +++++-----------------
> 1 file changed, 36 insertions(+), 153 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/chown/chown01.c b/testcases/kernel/syscalls/chown/chown01.c
> index 2e42153d6..a263db1bc 100644
> --- a/testcases/kernel/syscalls/chown/chown01.c
> +++ b/testcases/kernel/syscalls/chown/chown01.c
> @@ -1,179 +1,62 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
> - *
> - * 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:
> - *
> - * https://urldefense.com/v3/__http://www.sgi.com__;!!GqivPVa7Brio!K38BOnObiPoxRPvXRHJYzDyzV8BKNGdZqVCqrhJBHAsp630RZ__NSCORk-tOnZMBX6-b$
> - *
> - * For further information regarding this notice, see:
> - *
> - * https://urldefense.com/v3/__http://oss.sgi.com/projects/GenInfo/NoticeExplan/__;!!GqivPVa7Brio!K38BOnObiPoxRPvXRHJYzDyzV8BKNGdZqVCqrhJBHAsp630RZ__NSCORk-tOnfjKGQhh$
> - *
> + * AUTHOR: William Roske
> + * CO-PILOT: Dave Fenner
> */
> -/* $Id: chown01.c,v 1.6 2009/08/28 11:59:17 vapier Exp $ */
> -/**********************************************************
> - *
> - * OS Test - Silicon Graphics, Inc.
> - *
> - * TEST IDENTIFIER : chown01
> - *
> - * EXECUTED BY : anyone
> - *
> - * TEST TITLE : Basic test for chown(2)
> - *
> - * PARENT DOCUMENT : usctpl01
> - *
> - * TEST CASE TOTAL : 1
> - *
> - * WALL CLOCK TIME : 1
> - *
> - * CPU TYPES : ALL
> - *
> - * AUTHOR : William Roske
> - *
> - * CO-PILOT : Dave Fenner
> - *
> - * DATE STARTED : 03/30/92
> - *
> - * INITIAL RELEASE : UNICOS 7.0
> - *
> - * TEST CASES
> - *
> - * 1.) chown(2) returns...(See Description)
> - *
> - * INPUT SPECIFICATIONS
> - * The standard options for system call tests are accepted.
> - * (See the parse_opts(3) man page).
> - *
> - * OUTPUT SPECIFICATIONS
> - *$
> - * DURATION
> - * Terminates - with frequency and infinite modes.
> - *
> - * SIGNALS
> - * Uses SIGUSR1 to pause before test if option set.
> - * (See the parse_opts(3) man page).
> - *
> - * RESOURCES
> - * None
> - *
> - * ENVIRONMENTAL NEEDS
> - * No run-time environmental needs.
> - *
> - * SPECIAL PROCEDURAL REQUIREMENTS
> - * None
> - *
> - * INTERCASE DEPENDENCIES
> - * None
> - *
> - * DETAILED DESCRIPTION
> - * This is a Phase I test for the chown(2) system call. It is intended
> - * to provide a limited exposure of the system call, for now. It
> - * should/will be extended when full functional tests are written for
> - * chown(2).
> - *
> - * Setup:
> - * Setup signal handling.
> - * 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, Issue a PASS message.
> +
> +/*\
> + * [Description]
> *
> - * Cleanup:
> - * Print errno log and/or timing stats if options given
> + * This is a Phase I test for the chown(2) system call. It is intended
> + * to provide a limited exposure of the system call, for now. It
> + * should/will be extended when full functional tests are written for
> + * chown(2).
> *
> + * [Algorithm]
> *
> - *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
> + * - Execute system call
> + * - Check return code, if system call failed (return=-1)
> + * - Log the errno and Issue a FAIL message
> + * - Otherwise, Issue a PASS message
> + */
>
> +#include <stdio.h>
> #include <sys/types.h>
> #include <fcntl.h>
> #include <errno.h>
> #include <string.h>
> #include <signal.h>
> -#include "test.h"
> -#include "safe_macros.h"
> -#include "compat_16.h"
>
> -TCID_DEFINE(chown01);
> -int TST_TOTAL = 1;
> +#include "tst_test.h"
> +#include "compat_tst_16.h"
>
> char fname[255];
> int uid, gid;
>
> -static void setup(void);
> -static void cleanup(void);
> -
> -int main(int ac, char **av)
> +static void run(void)
> {
> - int lc;
> -
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - tst_count = 0;
> -
> - TEST(CHOWN(cleanup, fname, uid, gid));
> -
> - if (TEST_RETURN == -1) {
> - tst_resm(TFAIL | TTERRNO, "chown(%s, %d,%d) failed",
> - fname, uid, gid);
> - } else {
> - tst_resm(TPASS, "chown(%s, %d,%d) returned %ld",
> - fname, uid, gid, TEST_RETURN);
> - }
> -
> - }
> -
> - cleanup();
> - tst_exit();
> + TEST(CHOWN(fname, uid, gid));
> +
> + if (TST_RET == -1)
> + tst_res(TFAIL | TTERRNO, "chown(%s, %d,%d) failed",
> + fname, uid, gid);
> + else
> + tst_res(TPASS, "chown(%s, %d,%d) returned %ld",
> + fname, uid, gid, TST_RET);
Instead of TEST() and return value checks we could write:
TST_EXP_PASS(CHOWN(fname, uid, gid), "chown(%s,%d,%d)", ...);
> }
>
> static void setup(void)
> {
> -
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> -
> - tst_tmpdir();
> -
> - UID16_CHECK((uid = geteuid()), "chown", cleanup)
> - GID16_CHECK((gid = getegid()), "chown", cleanup)
> -
> + UID16_CHECK((uid = geteuid()), "chown");
> + GID16_CHECK((gid = getegid()), "chown");
> sprintf(fname, "t_%d", getpid());
What about using some constant for the file name?
> -
> - SAFE_FILE_PRINTF(cleanup, fname, "davef");
> + SAFE_FILE_PRINTF(fname, "davef");
> }
>
> -static void cleanup(void)
> -{
> - tst_rmdir();
> +static struct tst_test test = {
> + .needs_tmpdir = 1,
> + .setup = setup,
> + .test_all = run,
> +};
>
> -}
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] [PATCH 2/2] syscalls/chown: rewrite chown/chown03.c with the new api
2021-03-26 3:12 ` [LTP] [PATCH 2/2] syscalls/chown: rewrite chown/chown03.c " Xie Ziyao
@ 2021-04-14 14:23 ` Alexey Kodanev
2021-04-15 6:46 ` [LTP] 答复: " xieziyao
0 siblings, 1 reply; 5+ messages in thread
From: Alexey Kodanev @ 2021-04-14 14:23 UTC (permalink / raw)
To: ltp
On 26.03.2021 06:12, Xie Ziyao wrote:
> For this:
> testcases/kernel/syscalls/chown/chown03.c
>
> Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
> ---
> testcases/kernel/syscalls/chown/chown03.c | 232 +++++++---------------
> 1 file changed, 73 insertions(+), 159 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/chown/chown03.c b/testcases/kernel/syscalls/chown/chown03.c
> index 2c7bcfe7d..dfab3691b 100644
> --- a/testcases/kernel/syscalls/chown/chown03.c
> +++ b/testcases/kernel/syscalls/chown/chown03.c
> @@ -1,72 +1,31 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> + * Copyright (c) International Business Machines Corp., 2001
> *
> - * 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
> */
>
> -/*
> - * Test Name: chown03
> - *
> - * Test Description:
> - * Verify that, chown(2) succeeds to change the group of a file specified
> - * by path when called by non-root user with the following constraints,
> - * - euid of the process is equal to the owner of the file.
> - * - the intended gid is either egid, or one of the supplementary gids
> - * of the process.
> - * Also, verify that chown() clears the setuid/setgid bits set on the 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>
> - * chown03 [-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.
> +/*\
> + * [Description]
> *
> - * HISTORY
> - * 07/2001 Ported by Wayne Boyer
> + * Verify that, chown(2) succeeds to change the group of a file specified
> + * by path when called by non-root user with the following constraints,
> + * - euid of the process is equal to the owner of the file.
> + * - the intended gid is either egid, or one of the supplementary gids
> + * of the process.
> + * Also, verify that chown() clears the setuid/setgid bits set on the file.
> *
> - * RESTRICTIONS:
> + * [Algorithm]
> *
> + * - 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
> */
>
> #include <stdio.h>
> @@ -80,123 +39,78 @@
> #include <grp.h>
> #include <pwd.h>
>
> -#include "test.h"
> -#include "safe_macros.h"
> -#include "compat_16.h"
> +#include "tst_test.h"
> +#include "compat_tst_16.h"
>
> #define FILE_MODE (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
> #define NEW_PERMS (S_IFREG|S_IRWXU|S_IRWXG|S_ISUID|S_ISGID)
> #define TESTFILE "testfile"
>
> -TCID_DEFINE(chown03);
> -int TST_TOTAL = 1; /* Total number of test conditions */
> -char nobody_uid[] = "nobody";
> -struct passwd *ltpuser;
> -
> -void setup(); /* setup function for the test */
> -void cleanup(); /* cleanup function for the test */
> -
> -int main(int ac, char **av)
> +static void run(void)
> {
> struct stat stat_buf; /* stat(2) struct contents */
> - int lc;
> uid_t user_id; /* Owner id of the test file. */
> gid_t group_id; /* Group id of the test file. */
I don't think these comments are helpful.
>
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - tst_count = 0;
> -
> - UID16_CHECK((user_id = geteuid()), "chown", cleanup)
> - GID16_CHECK((group_id = getegid()), "chown", cleanup)
> -
> - TEST(CHOWN(cleanup, TESTFILE, -1, group_id));
> -
> - if (TEST_RETURN == -1) {
> - tst_resm(TFAIL | TTERRNO, "chown(%s, ..) failed",
> - TESTFILE);
> - continue;
> - }
> -
> - if (stat(TESTFILE, &stat_buf) == -1)
> - tst_brkm(TFAIL | TERRNO, cleanup,
> - "stat failed");
> -
> - if (stat_buf.st_uid != user_id ||
> - stat_buf.st_gid != group_id)
> - tst_resm(TFAIL, "%s: Incorrect ownership"
> - "set to %d %d, Expected %d %d",
> - TESTFILE, stat_buf.st_uid,
> - stat_buf.st_gid, user_id, group_id);
> -
> - if (stat_buf.st_mode !=
> - (NEW_PERMS & ~(S_ISUID | S_ISGID)))
> - tst_resm(TFAIL, "%s: incorrect mode permissions"
> - " %#o, Expected %#o", TESTFILE,
> - stat_buf.st_mode,
> - NEW_PERMS & ~(S_ISUID | S_ISGID));
> - else
> - tst_resm(TPASS, "chown(%s, ..) was successful",
> - TESTFILE);
> - }
> -
> - cleanup();
> - tst_exit();
> + UID16_CHECK((user_id = geteuid()), "chown");
> + GID16_CHECK((group_id = getegid()), "chown");
> +
> + TEST(CHOWN(TESTFILE, -1, group_id));
> + if (TST_RET == -1)
> + tst_res(TFAIL | TTERRNO, "chown(%s, ..) failed",
> + TESTFILE);
It could be replaced with TST_EXP_PASS() macro (+ TPASS message below).
> +
> + SAFE_STAT(TESTFILE, &stat_buf);
> +
> + if (stat_buf.st_uid != user_id || stat_buf.st_gid != group_id)
> + tst_res(TFAIL, "%s: Incorrect ownership"
> + "set to %d %d, Expected %d %d",
> + TESTFILE, stat_buf.st_uid,
> + stat_buf.st_gid, user_id, group_id);
> +
> + if (stat_buf.st_mode != (NEW_PERMS & ~(S_ISUID | S_ISGID)))
> + tst_res(TFAIL, "%s: incorrect mode permissions"
> + " %#o, Expected %#o", TESTFILE,
> + stat_buf.st_mode,
> + NEW_PERMS & ~(S_ISUID | S_ISGID));
> + else
> + tst_res(TPASS, "chown(%s, ..) was successful",
> + TESTFILE);
> }
>
> -/*
> - * 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
> - * Change the group ownership on testfile.
> - */
> -void setup(void)
> +static void setup(void)
> {
> - int fd; /* file handler for testfile */
> -
> - TEST_PAUSE;
> -
> - tst_require_root();
> + int fd; /* file handler for testfile */
^
Also, this comment is not really needed here.
> + struct passwd *ltpuser;
>
> - tst_sig(FORK, DEF_HANDLER, cleanup);
> -
> - tst_tmpdir();
> -
> - ltpuser = getpwnam(nobody_uid);
> + ltpuser = SAFE_GETPWNAM("nobody");
> if (ltpuser == NULL)
> - tst_brkm(TBROK | TERRNO, NULL, "getpwnam(\"nobody\") failed");
> - SAFE_SETEGID(NULL, ltpuser->pw_gid);
> - SAFE_SETEUID(NULL, ltpuser->pw_uid);
> + tst_brk(TBROK | TTERRNO,
> + "getpwnam(\"nobody\") failed");
SAFE_GETPWNAM() would have already call tst_brk() if getpwnam()
had returned null.
> + SAFE_SETEGID(ltpuser->pw_gid);
> + SAFE_SETEUID(ltpuser->pw_uid);
>
> /* Create a test file under temporary directory */
> - if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1)
> - tst_brkm(TBROK | TERRNO, cleanup,
> - "open(%s, O_RDWR|O_CREAT, %o) failed", TESTFILE,
> - FILE_MODE);
> -
> - SAFE_SETEUID(cleanup, 0);
> -
> - SAFE_FCHOWN(cleanup, fd, -1, 0);
> + fd = SAFE_OPEN(TESTFILE, O_RDWR | O_CREAT, FILE_MODE);
>
> - SAFE_FCHMOD(cleanup, fd, NEW_PERMS);
> -
> - SAFE_SETEUID(cleanup, ltpuser->pw_uid);
> -
> - SAFE_CLOSE(cleanup, fd);
> + SAFE_SETEUID(0);
> + SAFE_FCHOWN(fd, -1, 0);
> + SAFE_FCHMOD(fd, NEW_PERMS);
> + SAFE_SETEUID(ltpuser->pw_uid);
> + SAFE_CLOSE(fd);
> }
>
> -void cleanup(void)
> +static void cleanup(void)
> {
> - if (setegid(0) == -1)
> - tst_resm(TWARN | TERRNO, "setegid(0) failed");
> - if (seteuid(0) == -1)
> - tst_resm(TWARN | TERRNO, "seteuid(0) failed");
> + SAFE_SETEGID(0);
> + SAFE_SETEUID(0);
> +}
>
> - tst_rmdir();
> +static struct tst_test test = {
> + .needs_root = 1,
> + .needs_tmpdir = 1,
> + .setup = setup,
> + .cleanup = cleanup,
> + .test_all = run,
> +};
>
> -}
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] 答复: [PATCH 2/2] syscalls/chown: rewrite chown/chown03.c with the new api
2021-04-14 14:23 ` Alexey Kodanev
@ 2021-04-15 6:46 ` xieziyao
0 siblings, 0 replies; 5+ messages in thread
From: xieziyao @ 2021-04-15 6:46 UTC (permalink / raw)
To: ltp
Hi,
Thanks so much for your review!
I just re-checked the latest code and submit the v2 version based on your suggestions.
Best Regards,
Ziyao
-----????-----
???: Alexey Kodanev [mailto:alexey.kodanev@oracle.com]
????: 2021?4?14? 22:24
???: xieziyao <xieziyao@huawei.com>; ltp@lists.linux.it
??: Re: [LTP] [PATCH 2/2] syscalls/chown: rewrite chown/chown03.c with the new api
On 26.03.2021 06:12, Xie Ziyao wrote:
> For this:
> testcases/kernel/syscalls/chown/chown03.c
>
> Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
> ---
> testcases/kernel/syscalls/chown/chown03.c | 232
> +++++++---------------
> 1 file changed, 73 insertions(+), 159 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/chown/chown03.c
> b/testcases/kernel/syscalls/chown/chown03.c
> index 2c7bcfe7d..dfab3691b 100644
> --- a/testcases/kernel/syscalls/chown/chown03.c
> +++ b/testcases/kernel/syscalls/chown/chown03.c
> @@ -1,72 +1,31 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> + * Copyright (c) International Business Machines Corp., 2001
> *
> - * 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
> */
>
> -/*
> - * Test Name: chown03
> - *
> - * Test Description:
> - * Verify that, chown(2) succeeds to change the group of a file
> specified
> - * by path when called by non-root user with the following constraints,
> - * - euid of the process is equal to the owner of the file.
> - * - the intended gid is either egid, or one of the supplementary gids
> - * of the process.
> - * Also, verify that chown() clears the setuid/setgid bits set on the 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>
> - * chown03 [-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.
> +/*\
> + * [Description]
> *
> - * HISTORY
> - * 07/2001 Ported by Wayne Boyer
> + * Verify that, chown(2) succeeds to change the group of a file
> + specified
> + * by path when called by non-root user with the following
> + constraints,
> + * - euid of the process is equal to the owner of the file.
> + * - the intended gid is either egid, or one of the supplementary gids
> + * of the process.
> + * Also, verify that chown() clears the setuid/setgid bits set on the file.
> *
> - * RESTRICTIONS:
> + * [Algorithm]
> *
> + * - 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
> */
>
> #include <stdio.h>
> @@ -80,123 +39,78 @@
> #include <grp.h>
> #include <pwd.h>
>
> -#include "test.h"
> -#include "safe_macros.h"
> -#include "compat_16.h"
> +#include "tst_test.h"
> +#include "compat_tst_16.h"
>
> #define FILE_MODE (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)
> #define NEW_PERMS (S_IFREG|S_IRWXU|S_IRWXG|S_ISUID|S_ISGID)
> #define TESTFILE "testfile"
>
> -TCID_DEFINE(chown03);
> -int TST_TOTAL = 1; /* Total number of test conditions */
> -char nobody_uid[] = "nobody";
> -struct passwd *ltpuser;
> -
> -void setup(); /* setup function for the test */
> -void cleanup(); /* cleanup function for the test */
> -
> -int main(int ac, char **av)
> +static void run(void)
> {
> struct stat stat_buf; /* stat(2) struct contents */
> - int lc;
> uid_t user_id; /* Owner id of the test file. */
> gid_t group_id; /* Group id of the test file. */
I don't think these comments are helpful.
>
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - tst_count = 0;
> -
> - UID16_CHECK((user_id = geteuid()), "chown", cleanup)
> - GID16_CHECK((group_id = getegid()), "chown", cleanup)
> -
> - TEST(CHOWN(cleanup, TESTFILE, -1, group_id));
> -
> - if (TEST_RETURN == -1) {
> - tst_resm(TFAIL | TTERRNO, "chown(%s, ..) failed",
> - TESTFILE);
> - continue;
> - }
> -
> - if (stat(TESTFILE, &stat_buf) == -1)
> - tst_brkm(TFAIL | TERRNO, cleanup,
> - "stat failed");
> -
> - if (stat_buf.st_uid != user_id ||
> - stat_buf.st_gid != group_id)
> - tst_resm(TFAIL, "%s: Incorrect ownership"
> - "set to %d %d, Expected %d %d",
> - TESTFILE, stat_buf.st_uid,
> - stat_buf.st_gid, user_id, group_id);
> -
> - if (stat_buf.st_mode !=
> - (NEW_PERMS & ~(S_ISUID | S_ISGID)))
> - tst_resm(TFAIL, "%s: incorrect mode permissions"
> - " %#o, Expected %#o", TESTFILE,
> - stat_buf.st_mode,
> - NEW_PERMS & ~(S_ISUID | S_ISGID));
> - else
> - tst_resm(TPASS, "chown(%s, ..) was successful",
> - TESTFILE);
> - }
> -
> - cleanup();
> - tst_exit();
> + UID16_CHECK((user_id = geteuid()), "chown");
> + GID16_CHECK((group_id = getegid()), "chown");
> +
> + TEST(CHOWN(TESTFILE, -1, group_id));
> + if (TST_RET == -1)
> + tst_res(TFAIL | TTERRNO, "chown(%s, ..) failed",
> + TESTFILE);
It could be replaced with TST_EXP_PASS() macro (+ TPASS message below).
> +
> + SAFE_STAT(TESTFILE, &stat_buf);
> +
> + if (stat_buf.st_uid != user_id || stat_buf.st_gid != group_id)
> + tst_res(TFAIL, "%s: Incorrect ownership"
> + "set to %d %d, Expected %d %d",
> + TESTFILE, stat_buf.st_uid,
> + stat_buf.st_gid, user_id, group_id);
> +
> + if (stat_buf.st_mode != (NEW_PERMS & ~(S_ISUID | S_ISGID)))
> + tst_res(TFAIL, "%s: incorrect mode permissions"
> + " %#o, Expected %#o", TESTFILE,
> + stat_buf.st_mode,
> + NEW_PERMS & ~(S_ISUID | S_ISGID));
> + else
> + tst_res(TPASS, "chown(%s, ..) was successful",
> + TESTFILE);
> }
>
> -/*
> - * 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
> - * Change the group ownership on testfile.
> - */
> -void setup(void)
> +static void setup(void)
> {
> - int fd; /* file handler for testfile */
> -
> - TEST_PAUSE;
> -
> - tst_require_root();
> + int fd; /* file handler for testfile */
^
Also, this comment is not really needed here.
> + struct passwd *ltpuser;
>
> - tst_sig(FORK, DEF_HANDLER, cleanup);
> -
> - tst_tmpdir();
> -
> - ltpuser = getpwnam(nobody_uid);
> + ltpuser = SAFE_GETPWNAM("nobody");
> if (ltpuser == NULL)
> - tst_brkm(TBROK | TERRNO, NULL, "getpwnam(\"nobody\") failed");
> - SAFE_SETEGID(NULL, ltpuser->pw_gid);
> - SAFE_SETEUID(NULL, ltpuser->pw_uid);
> + tst_brk(TBROK | TTERRNO,
> + "getpwnam(\"nobody\") failed");
SAFE_GETPWNAM() would have already call tst_brk() if getpwnam() had returned null.
> + SAFE_SETEGID(ltpuser->pw_gid);
> + SAFE_SETEUID(ltpuser->pw_uid);
>
> /* Create a test file under temporary directory */
> - if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1)
> - tst_brkm(TBROK | TERRNO, cleanup,
> - "open(%s, O_RDWR|O_CREAT, %o) failed", TESTFILE,
> - FILE_MODE);
> -
> - SAFE_SETEUID(cleanup, 0);
> -
> - SAFE_FCHOWN(cleanup, fd, -1, 0);
> + fd = SAFE_OPEN(TESTFILE, O_RDWR | O_CREAT, FILE_MODE);
>
> - SAFE_FCHMOD(cleanup, fd, NEW_PERMS);
> -
> - SAFE_SETEUID(cleanup, ltpuser->pw_uid);
> -
> - SAFE_CLOSE(cleanup, fd);
> + SAFE_SETEUID(0);
> + SAFE_FCHOWN(fd, -1, 0);
> + SAFE_FCHMOD(fd, NEW_PERMS);
> + SAFE_SETEUID(ltpuser->pw_uid);
> + SAFE_CLOSE(fd);
> }
>
> -void cleanup(void)
> +static void cleanup(void)
> {
> - if (setegid(0) == -1)
> - tst_resm(TWARN | TERRNO, "setegid(0) failed");
> - if (seteuid(0) == -1)
> - tst_resm(TWARN | TERRNO, "seteuid(0) failed");
> + SAFE_SETEGID(0);
> + SAFE_SETEUID(0);
> +}
>
> - tst_rmdir();
> +static struct tst_test test = {
> + .needs_root = 1,
> + .needs_tmpdir = 1,
> + .setup = setup,
> + .cleanup = cleanup,
> + .test_all = run,
> +};
>
> -}
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-15 6:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-26 3:12 [LTP] [PATCH 1/2] syscalls/chown: rewrite chown/chown01.c with the new api Xie Ziyao
2021-03-26 3:12 ` [LTP] [PATCH 2/2] syscalls/chown: rewrite chown/chown03.c " Xie Ziyao
2021-04-14 14:23 ` Alexey Kodanev
2021-04-15 6:46 ` [LTP] 答复: " xieziyao
2021-04-14 14:11 ` [LTP] [PATCH 1/2] syscalls/chown: rewrite chown/chown01.c " Alexey Kodanev
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.