[LTP] [PATCH v3 3/3] syscalls/setgroups03: Convert to new API
Yang Xu
xuyang2018.jy@fujitsu.com
Mon Aug 14 13:30:48 CEST 2023
1.merge setgroups04 to setgroups03
2.use safe_macro macro
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
runtest/syscalls | 2 -
.../kernel/syscalls/setgroups/.gitignore | 2 -
.../kernel/syscalls/setgroups/setgroups03.c | 247 ++++--------------
.../kernel/syscalls/setgroups/setgroups04.c | 163 ------------
4 files changed, 56 insertions(+), 358 deletions(-)
delete mode 100644 testcases/kernel/syscalls/setgroups/setgroups04.c
diff --git a/runtest/syscalls b/runtest/syscalls
index 1028e45fc..119710d63 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -1331,8 +1331,6 @@ setgroups02 setgroups02
setgroups02_16 setgroups02_16
setgroups03 setgroups03
setgroups03_16 setgroups03_16
-setgroups04 setgroups04
-setgroups04_16 setgroups04_16
sethostname01 sethostname01
sethostname02 sethostname02
diff --git a/testcases/kernel/syscalls/setgroups/.gitignore b/testcases/kernel/syscalls/setgroups/.gitignore
index 0649a3425..9de928241 100644
--- a/testcases/kernel/syscalls/setgroups/.gitignore
+++ b/testcases/kernel/syscalls/setgroups/.gitignore
@@ -4,5 +4,3 @@
/setgroups02_16
/setgroups03
/setgroups03_16
-/setgroups04
-/setgroups04_16
diff --git a/testcases/kernel/syscalls/setgroups/setgroups03.c b/testcases/kernel/syscalls/setgroups/setgroups03.c
index 490b06996..d0331b216 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups03.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups03.c
@@ -1,222 +1,87 @@
+// 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) Bull S.A. 2001
+ * Copyright (c) International Business Machines Corp., 2001
+ * Copyright (c) Linux Test Project, 2003-2023
+ * 07/2001 Ported by Wayne Boyer
+ * 05/2002 Ported by André Merlier
*/
-/*
- * Test Name: setgroups03
- *
- * Test Description:
- * Verify that,
- * 1. setgroups() fails with -1 and sets errno to EINVAL if the size
- * argument value is > NGROUPS
- * 2. setgroups() fails with -1 and sets errno to EPERM if the
- * calling process is not super-user.
+/*\
+ * [Description]
*
- * Expected Result:
- * setgroups() should fail with return value -1 and set expected errno.
+ * Test for EINVAL, EPERM, EFAULT errors.
*
- * Algorithm:
- * Setup:
- * Setup signal handling.
- * Pause for SIGUSR1 if option specified.
+ * - setgroups() fails with EINVAL if the size argument value is > NGROUPS.
*
- * Test:
- * Loop if the proper options are given.
- * Execute system call
- * Check return code, if system call failed (return=-1)
- * if errno set == expected errno
- * Issue sys call fails with expected return value and errno.
- * Otherwise,
- * Issue sys call fails with unexpected errno.
- * Otherwise,
- * Issue sys call returns unexpected value.
- *
- * Cleanup:
- * Print errno log and/or timing stats if options given
- *
- * Usage: <for command-line>
- * setgroups03 [-c n] [-e] [-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 executed by 'non-super-user' only.
+ * - setgroups() fails with EPERM if the calling process is not super-user.
*
+ * - setgroups() fails with EFAULT if the list has an invalid address.
*/
-#include <limits.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
-#include "test.h"
+#include <pwd.h>
+#include <stdlib.h>
-#include "compat_16.h"
+#include "tst_test.h"
+#include "compat_tst_16.h"
#define TESTUSER "nobody"
-char nobody_uid[] = "nobody";
-struct passwd *ltpuser;
-
-TCID_DEFINE(setgroups03);
-int TST_TOTAL = 2;
-
-GID_T *groups_list; /* Array to hold gids for getgroups() */
+static GID_T *glist1, *glist2, *glist3;
+static struct passwd *user_info;
-int setup1(); /* setup function to test error EPERM */
-void setup(); /* setup function for the test */
-void cleanup(); /* cleanup function for the test */
-
-struct test_case_t { /* test case struct. to hold ref. test cond's */
- size_t gsize_add;
- int list;
- char *desc;
+static struct tcase {
+ int gsize;
+ GID_T **glist;
int exp_errno;
- int (*setupfunc) ();
-} Test_cases[] = {
- {
- 1, 1, "Size is > sysconf(_SC_NGROUPS_MAX)", EINVAL, NULL}, {
- 0, 2, "Permission denied, not super-user", EPERM, setup1}
+} tcases[] = {
+ {NGROUPS + 1, &glist1, EINVAL},
+ {NGROUPS, &glist2, EPERM},
+ {NGROUPS, &glist3, EFAULT},
};
-int main(int ac, char **av)
+static void verify_setgroups(unsigned int i)
{
- int lc;
- int gidsetsize; /* total no. of groups */
- int i;
- char *test_desc; /* test specific error message */
- int ngroups_max = sysconf(_SC_NGROUPS_MAX); /* max no. of groups in the current system */
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- groups_list = malloc(ngroups_max * sizeof(GID_T));
- if (groups_list == NULL) {
- tst_brkm(TBROK, NULL, "malloc failed to alloc %zu errno "
- " %d ", ngroups_max * sizeof(GID_T), errno);
- }
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- for (i = 0; i < TST_TOTAL; i++) {
- if (Test_cases[i].setupfunc != NULL) {
- Test_cases[i].setupfunc();
- }
+ struct tcase *tc = &tcases[i];
- gidsetsize = ngroups_max + Test_cases[i].gsize_add;
- test_desc = Test_cases[i].desc;
+ if (tc->exp_errno == EPERM)
+ SAFE_SETEUID(user_info->pw_uid);
- /*
- * Call setgroups() to test different test conditions
- * verify that it fails with -1 return value and
- * sets appropriate errno.
- */
- TEST(SETGROUPS(cleanup, gidsetsize, groups_list));
+ TST_EXP_FAIL(SETGROUPS(tc->gsize, *tc->glist), tc->exp_errno,
+ "setgroups(%d, groups_list)", tc->gsize);
- if (TEST_RETURN != -1) {
- tst_resm(TFAIL, "setgroups(%d) returned %ld, "
- "expected -1, errno=%d", gidsetsize,
- TEST_RETURN, Test_cases[i].exp_errno);
- continue;
- }
-
- if (TEST_ERRNO == Test_cases[i].exp_errno) {
- tst_resm(TPASS,
- "setgroups(%d) fails, %s, errno=%d",
- gidsetsize, test_desc, TEST_ERRNO);
- } else {
- tst_resm(TFAIL, "setgroups(%d) fails, %s, "
- "errno=%d, expected errno=%d",
- gidsetsize, test_desc, TEST_ERRNO,
- Test_cases[i].exp_errno);
- }
- }
-
- }
-
- cleanup();
-
- tst_exit();
+ if (tc->exp_errno == EPERM)
+ SAFE_SETEUID(0);
}
-/*
- * setup() - performs all ONE TIME setup for this test.
- *
- * Call individual test specific setup functions.
- */
-void setup(void)
+static void setup(void)
{
- tst_require_root();
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
+ glist1 = SAFE_MALLOC((NGROUPS + 1) * sizeof(GID_T));
- TEST_PAUSE;
+ user_info = SAFE_GETPWNAM(TESTUSER);
+ GID16_CHECK(user_info->pw_gid, getpwnam);
+ glist2 = (GID_T *)&(user_info->pw_gid);
+ glist3 = tst_get_bad_addr(NULL);
}
-/*
- * setup1 - Setup function to test setgroups() which returns -1
- * and sets errno to EPERM.
- *
- * Get the user info. from /etc/passwd file.
- * This function returns 0 on success.
- */
-int setup1(void)
+static void cleanup(void)
{
- struct passwd *user_info; /* struct. to hold test user info */
-
-/* Switch to nobody user for correct error code collection */
- ltpuser = getpwnam(nobody_uid);
- if (seteuid(ltpuser->pw_uid) == -1) {
- tst_resm(TINFO, "setreuid failed to "
- "to set the effective uid to %d", ltpuser->pw_uid);
- perror("setreuid");
- }
-
- if ((user_info = getpwnam(TESTUSER)) == NULL) {
- tst_brkm(TFAIL, cleanup, "getpwnam(2) of %s Failed", TESTUSER);
- }
-
- if (!GID_SIZE_CHECK(user_info->pw_gid)) {
- tst_brkm(TBROK,
- cleanup,
- "gid returned from getpwnam is too large for testing setgroups16");
- }
- groups_list[0] = user_info->pw_gid;
- return 0;
+ if (glist1)
+ free(glist1);
}
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- */
-void cleanup(void)
-{
-
-}
+static struct tst_test test = {
+ .test = verify_setgroups,
+ .tcnt = ARRAY_SIZE(tcases),
+ .bufs = (struct tst_buffers []) {
+ {&glist1, .size = sizeof(GID_T)},
+ {&glist2, .size = sizeof(GID_T)},
+ {&glist3, .size = sizeof(GID_T)},
+ {&user_info, .size = sizeof(struct passwd)},
+ {},
+ },
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_root = 1,
+};
diff --git a/testcases/kernel/syscalls/setgroups/setgroups04.c b/testcases/kernel/syscalls/setgroups/setgroups04.c
deleted file mode 100644
index 971c86bd2..000000000
--- a/testcases/kernel/syscalls/setgroups/setgroups04.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) Bull S.A. 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
- */
-
-/*
- * Test Name: setgroups04
- *
- * Test Description:
- * Verify that, setgroups() fails with -1 and sets errno to EFAULT if the list has an invalid address.
- *
- * Expected Result:
- * setgroups() should fail with return value -1 and set expected errno.
- *
- * Algorithm:
- * 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)
- * if errno set == expected errno
- * Issue sys call fails with expected return value and errno.
- * Otherwise,
- * Issue sys call fails with unexpected errno.
- * Otherwise,
- * Issue sys call returns unexpected value.
- *
- * Cleanup:
- * Print errno log and/or timing stats if options given
- *
- * Usage: <for command-line>
- * setgroups04 [-c n] [-e] [-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
- * 05/2002 Ported by André Merlier
- *
- * RESTRICTIONS:
- * none.
- *
- */
-#include <sys/types.h>
-#include <sys/param.h>
-#include <unistd.h>
-#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
-
-#include "test.h"
-
-#include "compat_16.h"
-
-TCID_DEFINE(setgroups04);
-int TST_TOTAL = 1;
-
-GID_T groups_list[NGROUPS];
-
-void setup(); /* setup function for the test */
-void cleanup(); /* cleanup function for the test */
-
-#if !defined(UCLINUX)
-
-int main(int ac, char **av)
-{
- int lc;
- int gidsetsize; /* total no. of groups */
- char *test_desc; /* test specific error message */
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- /* Perform setup for test */
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- gidsetsize = NGROUPS;
- test_desc = "EFAULT";
-
- /*
- * Call setgroups() to test condition
- * verify that it fails with -1 return value and
- * sets appropriate errno.
- */
- TEST(SETGROUPS(cleanup, gidsetsize, sbrk(0)));
-
- if (TEST_RETURN != -1) {
- tst_resm(TFAIL, "setgroups() returned %ld, "
- "expected -1, errno=%d", TEST_RETURN,
- EFAULT);
- } else {
-
- if (TEST_ERRNO == EFAULT) {
- tst_resm(TPASS,
- "setgroups() fails with expected "
- "error EFAULT errno:%d", TEST_ERRNO);
- } else {
- tst_resm(TFAIL, "setgroups() fails, %s, "
- "errno=%d, expected errno=%d",
- test_desc, TEST_ERRNO, EFAULT);
- }
- }
-
- }
-
- cleanup();
- tst_exit();
-
-}
-
-#else
-
-int main(void)
-{
- tst_resm(TINFO, "test is not available on uClinux");
- tst_exit();
-}
-
-#endif /* if !defined(UCLINUX) */
-
-/*
- * setup()
- */
-void setup(void)
-{
- tst_require_root();
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
-}
-
-/*
- * cleanup()
- */
-void cleanup(void)
-{
-
-}
--
2.39.1
More information about the ltp
mailing list