* [LTP] [PATCH 1/2] Refactor setresgit01 test
2024-11-13 13:02 [LTP] [PATCH 0/2] setresgit testing suite refactoring Andrea Cervesato
@ 2024-11-13 13:02 ` Andrea Cervesato
2025-01-03 11:01 ` Petr Vorel
2024-11-13 13:02 ` [LTP] [PATCH 2/2] Refactor setresgit04 test Andrea Cervesato
1 sibling, 1 reply; 5+ messages in thread
From: Andrea Cervesato @ 2024-11-13 13:02 UTC (permalink / raw)
To: ltp
From: Andrea Cervesato <andrea.cervesato@suse.com>
Simplify general structure, using struct passwd only when it's strictly
needed and use new LTP API.
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
testcases/kernel/syscalls/setresgid/setresgid01.c | 264 ++++++----------------
1 file changed, 69 insertions(+), 195 deletions(-)
diff --git a/testcases/kernel/syscalls/setresgid/setresgid01.c b/testcases/kernel/syscalls/setresgid/setresgid01.c
index d66c42261e635c03c81b80955d1966b7be61efc9..a6692aedc6bb681696b7a17a41d8b6e20f1fd95d 100644
--- a/testcases/kernel/syscalls/setresgid/setresgid01.c
+++ b/testcases/kernel/syscalls/setresgid/setresgid01.c
@@ -1,216 +1,90 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) Wipro Technologies Ltd, 2002. 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.
- *
- * 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.
- *
+ * Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
*/
-/**********************************************************
- *
- * TEST IDENTIFIER : setresgid01
- *
- * EXECUTED BY : root / superuser
- *
- * TEST TITLE : Checking functionality of setresgid(2)
- *
- * TEST CASE TOTAL : 5
- *
- * AUTHOR : Madhu T L <madhu.tarikere@wipro.com>
- *
- * SIGNALS
- * Uses SIGUSR1 to pause before test if option set.
- * (See the parse_opts(3) man page).
- *
- * DESCRIPTION
- * Verify that,
- * 1. setresgid(2) is successful for setresgid(-1, -1, -1)
- * 2. setresgid(2) is successful for setresgid(-1, -1, nobody)
- * 3. setresgid(2) is successful for setresgid(-1, nobody, -1)
- * 4. setresgid(2) is successful for setresgid(nobody, -1, -1)
- * 5. setresgid(2) is successful for setresgid(root, root, root)
- *
- * Setup:
- * Setup signal handling.
- * Test caller is superuser
- * Check existence of root and nobody user id's
- * Pause for SIGUSR1 if option specified.
- *
- * Test:
- * Loop if the proper options are given.
- * Execute system call
- * Check return value and functionality, if success,
- * Issue PASS message
- * Otherwise,
- * Issue FAIL message
- *
- * Cleanup:
- * Print errno log and/or timing stats if options given
- *
- * USAGE: <for command-line>
- * setresgid01 [-c n] [-e] [-f] [-h] [-i n] [-I x] [-p] [-P x] [-t]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.
- * -f : Turn off functional testing
- * -h : Show help screen
- * -i n : Execute test n times.
- * -I x : Execute test for x seconds.
- * -p : Pause for SIGUSR1 before starting
- * -P x : Pause for x seconds between iterations.
- * -t : Turn on syscall timing.
- *
- ****************************************************************/
-#define _GNU_SOURCE 1
-#include <errno.h>
-#include <pwd.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include "test.h"
-#include "safe_macros.h"
-#include "compat_16.h"
+/*\
+ * [Description]
+ *
+ * Verify that setresgid() syscall correctly sets real user ID, effective user
+ * ID and the saved set-user ID in the calling process.
+ */
-#define EXP_RET_VAL 0
+#define _GNU_SOURCE
-struct test_case_t { /* test case structure */
- uid_t *rgid; /* real GID */
- uid_t *egid; /* effective GID */
- uid_t *sgid; /* saved GID */
- struct passwd *exp_rgid; /* Expected real GID */
- struct passwd *exp_egid; /* Expected effective GID */
- struct passwd *exp_sgid; /* Expected saved GID */
- char *desc; /* Test description */
+#include <pwd.h>
+#include "tst_test.h"
+#include "compat_tst_16.h"
+
+struct tcase {
+ uid_t *rgid;
+ uid_t *egid;
+ uid_t *sgid;
+ uid_t *exp_rgid;
+ uid_t *exp_egid;
+ uid_t *exp_sgid;
};
-TCID_DEFINE(setresgid01);
-static int testno;
-static struct passwd nobody, root;
-static uid_t nobody_gid, root_gid, neg = -1;
-
-static int test_functionality(uid_t, uid_t, uid_t);
-static void setup(void);
-static void cleanup(void);
-
-/* Don't change order of these test cases */
-static struct test_case_t tdat[] = {
- {&neg, &neg, &neg, &root, &root, &root,
- "setresgid(-1, -1, -1)"},
- {&neg, &neg, &nobody.pw_gid, &root, &root, &nobody,
- "setresgid(-1, -1, nobody)"},
- {&neg, &nobody.pw_gid, &neg, &root, &nobody, &nobody,
- "setresgid(-1, nobody, -1)"},
- {&nobody.pw_gid, &neg, &neg, &nobody, &nobody, &nobody,
- "setresgid(nobody, -1, -1)"},
- {&root.pw_gid, &root.pw_gid, &root.pw_gid, &root, &root, &root,
- "setresgid(root, root, root)"},
+static uid_t nobody_gid;
+static uid_t root_gid;
+static uid_t neg = -1;
+
+static struct tcase tcases[] = {
+ {
+ &neg, &neg, &neg,
+ &root_gid, &root_gid, &root_gid,
+ },
+ {
+ &neg, &neg, &nobody_gid,
+ &root_gid, &root_gid, &nobody_gid,
+ },
+ {
+ &neg, &nobody_gid, &neg,
+ &root_gid, &nobody_gid, &nobody_gid,
+ },
+ {
+ &nobody_gid, &neg, &neg,
+ &nobody_gid, &nobody_gid, &nobody_gid,
+ },
+ {
+ &root_gid, &root_gid, &root_gid,
+ &root_gid, &root_gid, &root_gid,
+ },
};
-int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]);
-
-int main(int argc, char **argv)
+static void run(unsigned int n)
{
- int lc;
+ struct tcase *tc = &tcases[n];
- tst_parse_opts(argc, argv, NULL, NULL);
+ uid_t cur_rgid;
+ uid_t cur_egid;
+ uid_t cur_sgid;
- setup();
+ SAFE_SETRESGID(*tc->rgid, *tc->egid, *tc->sgid);
+ SAFE_GETRESGID(&cur_rgid, &cur_egid, &cur_sgid);
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- /* reset tst_count in case we are looping */
- tst_count = 0;
-
- for (testno = 0; testno < TST_TOTAL; ++testno) {
-
- TEST(SETRESGID(cleanup, *tdat[testno].rgid, *tdat[testno].egid,
- *tdat[testno].sgid));
-
- if (TEST_RETURN == EXP_RET_VAL) {
- if (!test_functionality
- (tdat[testno].exp_rgid->pw_gid,
- tdat[testno].exp_egid->pw_gid,
- tdat[testno].exp_sgid->pw_gid)) {
-
- tst_resm(TPASS, "Test for %s "
- "successful",
- tdat[testno].desc);
- } else {
- tst_resm(TFAIL, "Functionality test "
- "for %s failed",
- tdat[testno].desc);
- }
- } else {
- tst_resm(TFAIL, "Test for %s failed; returned"
- " %ld (expected %d), errno %d (expected"
- " 0)", tdat[testno].desc,
- TEST_RETURN, EXP_RET_VAL, TEST_ERRNO);
- }
- }
- }
- cleanup();
-
- tst_exit();
+ TST_EXP_EQ_LI(*tc->exp_rgid, cur_rgid);
+ TST_EXP_EQ_LI(*tc->exp_egid, cur_egid);
+ TST_EXP_EQ_LI(*tc->exp_sgid, cur_sgid);
}
-static int test_functionality(uid_t exp_rgid, uid_t exp_egid, uid_t exp_sgid)
+static void setup(void)
{
- uid_t cur_rgid, cur_egid, cur_sgid;
+ struct passwd *pwd_buf;
- /* Get current real, effective and saved group id's */
- SAFE_GETRESGID(cleanup, &cur_rgid, &cur_egid, &cur_sgid);
+ pwd_buf = SAFE_GETPWNAM("root");
+ GID16_CHECK(pwd_buf->pw_gid, "setresgid");
+ root_gid = pwd_buf->pw_gid;
- if ((cur_rgid == exp_rgid) && (cur_egid == exp_egid)
- && (cur_sgid == exp_sgid)) {
- return 0;
- }
- return 1;
+ pwd_buf = SAFE_GETPWNAM("nobody");
+ GID16_CHECK(pwd_buf->pw_gid, "setresgid");
+ nobody_gid = pwd_buf->pw_gid;
}
-/*
- * setup()
- * performs all ONE TIME setup for this test
- */
-void setup(void)
-{
- struct passwd *passwd_p;
-
- tst_require_root();
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- if ((passwd_p = getpwnam("root")) == NULL) {
- tst_brkm(TBROK, NULL, "getpwnam() failed for root");
-
- }
- root = *passwd_p;
- GID16_CHECK((root_gid = root.pw_gid), "setresgid", cleanup)
-
- if ((passwd_p = getpwnam("nobody")) == NULL) {
- tst_brkm(TBROK, NULL, "nobody user id doesn't exist");
-
- }
- nobody = *passwd_p;
- GID16_CHECK((nobody_gid = nobody.pw_gid), "setresgid", cleanup)
-
- /* Pause if that option was specified
- * TEST_PAUSE contains the code to fork the test with the -c option.
- */
- TEST_PAUSE;
-}
-
-/*
- * cleanup()
- * performs all ONE TIME cleanup for this test at
- * completion or premature exit
- */
-void cleanup(void)
-{
-
-}
+static struct tst_test test = {
+ .test = run,
+ .setup = setup,
+ .tcnt = ARRAY_SIZE(tcases),
+ .needs_root = 1,
+};
--
2.43.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 5+ messages in thread* [LTP] [PATCH 2/2] Refactor setresgit04 test
2024-11-13 13:02 [LTP] [PATCH 0/2] setresgit testing suite refactoring Andrea Cervesato
2024-11-13 13:02 ` [LTP] [PATCH 1/2] Refactor setresgit01 test Andrea Cervesato
@ 2024-11-13 13:02 ` Andrea Cervesato
2025-01-03 11:02 ` Petr Vorel
1 sibling, 1 reply; 5+ messages in thread
From: Andrea Cervesato @ 2024-11-13 13:02 UTC (permalink / raw)
To: ltp
From: Andrea Cervesato <andrea.cervesato@suse.com>
Simplify the overall structure using newest LTP API.
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
testcases/kernel/syscalls/setresgid/setresgid04.c | 104 ++++++----------------
1 file changed, 25 insertions(+), 79 deletions(-)
diff --git a/testcases/kernel/syscalls/setresgid/setresgid04.c b/testcases/kernel/syscalls/setresgid/setresgid04.c
index 4d8e9685efac4fd5f53358ed29a603d0fb01702a..46c0ca341568cd8de2c590af248ad0db5916b815 100644
--- a/testcases/kernel/syscalls/setresgid/setresgid04.c
+++ b/testcases/kernel/syscalls/setresgid/setresgid04.c
@@ -1,101 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2014 Fujitsu Ltd.
- * Author: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
- *
- * 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.
- *
- * 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.
+ * Copyright (c) Zeng Linggang <zenglg.jy@cn.fujitsu.com>
+ * Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
*/
-/*
- * Test Description:
- * Verify that,
- * File system GID is always set to the same value as the (possibly new)
- * effective GID.
+
+/*\
+ * [Description]
+ *
+ * Verify that setresgid() syscall always sets the file system GID to the same
+ * value as the new effective GID.
*/
#define _GNU_SOURCE
-#include <errno.h>
-#include <unistd.h>
#include <pwd.h>
-#include <sys/stat.h>
-#include "test.h"
-#include "safe_macros.h"
-#include "compat_16.h"
+#include "tst_test.h"
+#include "compat_tst_16.h"
-TCID_DEFINE(setresgid04);
-int TST_TOTAL = 1;
static struct passwd *ltpuser;
-static void setup(void);
-static void setresgid_verify(void);
-static void cleanup(void);
-int main(int argc, char **argv)
+static void run(void)
{
- int i, lc;
-
- tst_parse_opts(argc, argv, NULL, NULL);
+ struct stat buf;
- setup();
+ TST_EXP_PASS(setresgid(-1, ltpuser->pw_gid, -1));
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- tst_count = 0;
- for (i = 0; i < TST_TOTAL; i++)
- setresgid_verify();
- }
+ SAFE_TOUCH("test_file", 0644, NULL);
+ SAFE_STAT("test_file", &buf);
- cleanup();
- tst_exit();
+ TST_EXP_EQ_LI(ltpuser->pw_gid, buf.st_gid);
}
static void setup(void)
{
- tst_require_root();
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
- tst_tmpdir();
-
- ltpuser = SAFE_GETPWNAM(cleanup, "nobody");
+ ltpuser = SAFE_GETPWNAM("nobody");
- GID16_CHECK(ltpuser->pw_gid, "setresgid", cleanup)
+ GID16_CHECK(ltpuser->pw_gid, "setresgid");
}
-static void setresgid_verify(void)
-{
- struct stat buf;
-
- TEST(SETRESGID(cleanup, -1, ltpuser->pw_gid, -1));
-
- if (TEST_RETURN != 0) {
- tst_resm(TFAIL | TTERRNO, "setresgid failed unexpectedly");
- return;
- }
-
- SAFE_TOUCH(cleanup, "test_file", 0644, NULL);
-
- SAFE_STAT(cleanup, "test_file", &buf);
-
- if (ltpuser->pw_gid == buf.st_gid) {
- tst_resm(TPASS, "setresgid succeeded as expected");
- } else {
- tst_resm(TFAIL,
- "setresgid failed unexpectedly; egid(%d) - st_gid(%d)",
- ltpuser->pw_gid, buf.st_gid);
- }
-}
-
-static void cleanup(void)
-{
- tst_rmdir();
-}
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .needs_root = 1,
+ .needs_tmpdir = 1,
+};
--
2.43.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 5+ messages in thread