[LTP] [PATCH 5/5] setdomainname03: Convert to new API
Petr Vorel
petr.vorel@gmail.com
Sun Jul 7 21:00:16 CEST 2019
Use _UTSNAME_LENGTH (65), which is defined in lapi/utsname.h
instead of __NEW_UTS_LEN (64).
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
.../syscalls/setdomainname/setdomainname03.c | 195 +++---------------
1 file changed, 32 insertions(+), 163 deletions(-)
diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname03.c b/testcases/kernel/syscalls/setdomainname/setdomainname03.c
index 82793b878..e53ea8806 100644
--- a/testcases/kernel/syscalls/setdomainname/setdomainname03.c
+++ b/testcases/kernel/syscalls/setdomainname/setdomainname03.c
@@ -1,185 +1,54 @@
+// SPDX-License-Identifier: GPL-2.0
/*
- * 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 to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved.
+ * Copyright (c) 2019 Petr Vorel <petr.vorel@gmail.com>
+ * Author: Saji Kumar.V.R <saji.kumar@wipro.com>
*/
-/**********************************************************
- *
- * TEST IDENTIFIER : setdomainname03
- *
- * EXECUTED BY : root / superuser
- *
- * TEST TITLE : test for EPERM error value when run as non superuser
- *
- * TEST CASE TOTAL : 1
- *
- * AUTHOR : Saji Kumar.V.R <saji.kumar@wipro.com>
- *
- * SIGNALS
- * Uses SIGUSR1 to pause before test if option set.
- * (See the parse_opts(3) man page).
- *
- * DESCRIPTION
- * Verify that, setdomainname(2) returns -1 and sets errno to EPERM
- * if the effective user id of the caller is not super-user.
- *
- * Algorithm:
- * Setup:
- * Setup signal handling.
- * Pause for SIGUSR1 if option specified.
- * save current domainname
- * change effective user id to "nobody" user
- *
- * Test:
- * Loop if the proper options are given.
- * Execute system call
- * Check return code, Check return code, if (system call failed (return=-1)) &
- * (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:
- * Change effective user id to root
- * Restore old domainname
- * Print errno log and/or timing stats if options given
- *
- * Usage: <for command-line>
- * setdomainname03 [-c n] [-e] [-i n] [-I x] [-P x] [-t] [-h] [-f] [-p]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.
- * -h : Show help screen
- * -f : Turn off functional testing
- * -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.
- *
- ****************************************************************/
-#include <string.h>
#include <errno.h>
#include <pwd.h>
-#include <linux/utsname.h>
-#include "test.h"
+#include "setdomainname.h"
-#define MAX_NAME_LEN __NEW_UTS_LEN
-
-char *TCID = "setdomainname03";
-int TST_TOTAL = 1;
-
-static char nobody_uid[] = "nobody";
struct passwd *ltpuser;
-static char test_domain_name[MAX_NAME_LEN] = "test_dom";
-static char old_domain_name[MAX_NAME_LEN];
-
-static void setup(); /* setup function for the tests */
-static void cleanup(); /* cleanup function for the tests */
-
-int main(int ac, char **av)
+static void do_test(void)
{
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- /*
- * Invoke setup function to call individual test setup functions
- * for the test which run as root/super-user.
- */
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
+ char *new = TST_VALID_DOMAIN_NAME;
- tst_count = 0;
-
- /*
- * Call setdomainname(2)
- */
- TEST(setdomainname(test_domain_name, MAX_NAME_LEN));
- if ((TEST_RETURN == -1) && (TEST_ERRNO == EPERM)) {
- tst_resm(TPASS, "expected failure; Got EPERM");
- } else {
- tst_resm(TFAIL, "Call failed to produce "
- "expected error; Expected errno: %d "
- "Got : %d, %s", EPERM, TEST_ERRNO,
- strerror(TEST_ERRNO));
- }
+ TEST(do_setdomainname(new, sizeof(new)));
+ if (TST_RET != -1) {
+ tst_res(TFAIL, "unexpected exit code: %ld", TST_RET);
+ return;
}
- /*
- * Invoke cleanup() to delete the test directories created
- * in the setup().
- */
- cleanup();
- tst_exit();
+ if (TST_ERR != EPERM) {
+ tst_res(TFAIL | TTERRNO, "unexpected errno: %d, expected: EPERM",
+ TST_ERR);
+ return;
+ }
+ tst_res(TPASS | TTERRNO, "expected failure");
}
-/*
- * setup(void) - performs all ONE TIME setup for this test.
- */
-void setup(void)
+void setup_setuid(void)
{
- tst_require_root();
-
- /* Capture unexpected signals */
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- /* Switch to nobody user for correct error code collection */
- if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
- tst_brkm(TBROK, NULL, "\"nobody\" user not present");
- }
- if (seteuid(ltpuser->pw_uid) == -1) {
- tst_resm(TWARN, "seteuid failed to "
- "to set the effective uid to %d", ltpuser->pw_uid);
- perror("seteuid");
- }
-
- /* Save current domainname */
- if ((getdomainname(old_domain_name, MAX_NAME_LEN)) < 0) {
- tst_brkm(TBROK, NULL, "getdomainname() failed while"
- " getting current domain name");
- }
-
- TEST_PAUSE;
-
+ ltpuser = SAFE_GETPWNAM("nobody");
+ SAFE_SETEUID(ltpuser->pw_uid);
+ setup();
}
-/*
- * cleanup() - Performs all ONE TIME cleanup for this test at
- */
-void cleanup(void)
+static void cleanup_setuid(void)
{
-
- /* Set effective user id back to root */
- if (seteuid(0) == -1) {
- tst_resm(TWARN, "seteuid failed to "
- "to set the effective uid to root");
- perror("seteuid");
- }
-
- /* Restore domain name */
- if ((setdomainname(old_domain_name, strlen(old_domain_name)))
- < 0) {
- tst_resm(TWARN, "setdomainname() failed while restoring"
- " domainname to \"%s\"", old_domain_name);
- }
-
+ SAFE_SETEUID(0);
+ cleanup();
}
+
+static struct tst_test test = {
+ .needs_root = 1,
+ .setup = setup_setuid,
+ .cleanup = cleanup_setuid,
+ .test_all = do_test,
+ .test_variants = TEST_VARIANTS,
+};
--
2.20.1
More information about the ltp
mailing list