syscalls/ipc: semctl04: Convert to new API and cleanup

Also make use of TST_EXP_FAIL

Signed-off-by: Feiyu Zhu <zhufy.jy@cn.fujitsu.com>
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>

2 files changed, 56 insertions, 169 deletions

diff --git a/testcases/kernel/syscalls/ipc/semctl/Makefile b/testcases/kernel/syscalls/ipc/semctl/Makefile
index 2f64ccf70..2a379d997 100644
--- a/testcases/kernel/syscalls/ipc/semctl/Makefile
+++ b/testcases/kernel/syscalls/ipc/semctl/Makefile
@@ -7,7 +7,7 @@ LTPLIBS = ltpipc ltpnewipc
 
 include $(top_srcdir)/include/mk/testcases.mk
 
-semctl01 semctl04 semctl05 semctl06 semctl07: LTPLDLIBS = -lltpipc
-semctl02 semctl03 semctl08 semctl09: LTPLDLIBS = -lltpnewipc
+semctl01 semctl05 semctl06 semctl07: LTPLDLIBS = -lltpipc
+semctl02 semctl03 semctl04 semctl08 semctl09: LTPLDLIBS = -lltpnewipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl04.c b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
index b1f199e60..8bbb721fe 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl04.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
@@ -1,200 +1,87 @@
+// 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
+ * HISTORY
+ *	03/2001 - Written by Wayne Boyer
  */
-
-/*
- * NAME
- *	semctl04.c
+/*\
+ * [DESCRIPTION]
  *
- * DESCRIPTION
- *	semctl04 - test for EPERM error
+ * Test for semctl() EPERM error
  *
- * ALGORITHM
- *	create a semaphore set without read or alter permissions
- *	get the user id for "nobody"
- *	fork a child process
- *	if child
- *	  set the ID of the child process to that of "nobody"
- *	  loop if that option was specified
- *	    call semctl() with two different invalid cases
- *	    check the errno value
- *	      issue a PASS message if we get EPERM
- *	    otherwise, the tests fails
- *	      issue a FAIL message
- *	  call cleanup
- *	if parent
- *	  wait for child to exit
- *	  remove the semaphore set
+ * Runs IPC_SET and IPC_RMID from unprivileged child process.
  *
- * USAGE:  <for command-line>
- *  semctl04 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -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
- *	03/2001 - Written by Wayne Boyer
- *
- * RESTRICTIONS
- *	test must be run as root
- */
-
-#include "ipcsem.h"
+\*/
 
 #include <pwd.h>
 #include <sys/wait.h>
+#include "tst_safe_sysv_ipc.h"
+#include "tst_test.h"
+#include "lapi/sem.h"
+#include "libnewipc.h"
 
-char *TCID = "semctl04";
-int TST_TOTAL = 2;
-
-int sem_id_1 = -1;
+static uid_t ltp_uid;
+static int sem_id = -1;
 
-uid_t ltp_uid;
-char *ltp_user = "nobody";
+static int tcases[] = { IPC_SET, IPC_RMID };
 
-int TC[] = { IPC_SET, IPC_RMID };
-
-int main(int ac, char **av)
+static void do_child(void)
 {
-	pid_t pid;
-	void do_child(void);
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();		/* global setup */
-
-	if ((pid = FORK_OR_VFORK()) == -1) {
-		tst_brkm(TBROK, cleanup, "could not fork");
-	}
-
-	if (pid == 0) {		/* child */
-		/* set the user ID of the child to the non root user */
-		if (setuid(ltp_uid) == -1) {
-			tst_resm(TBROK, "setuid() failed");
-			exit(1);
-		}
-
-		do_child();
+	int i;
+	union semun arg;
+	struct semid_ds perm;
 
-	} else {
-		if (waitpid(pid, NULL, 0) == -1) {
-			tst_resm(TBROK, "waitpid() failed");
-			tst_resm(TINFO, "waitpid() error = %d : %s", errno,
-				 strerror(errno));
+	for (i = 0; i < 2; i++) {
+		if (tcases[i] == IPC_SET) {
+			arg.buf = &perm;
+			memset(&perm, 0, sizeof(perm));
+			perm.sem_perm.uid = getuid() + 1;
+			perm.sem_perm.gid = getgid() + 1;
+			perm.sem_perm.mode = 0666;
 		}
 
-		/* if it exists, remove the semaphore resouce */
-		rm_sema(sem_id_1);
-
-		tst_rmdir();
+		TST_EXP_FAIL(semctl(sem_id, 0, tcases[i], arg), EPERM,
+			     "semctl() with nobody user in child");
 	}
-	cleanup();
-
-	tst_exit();
 }
 
-/*
- * do_child() - make the TEST call as the child process
- */
-void do_child(void)
+static void verify_semctl(void)
 {
-	int lc;
-	int i;
-	union semun arg;
-	struct semid_ds perm;
-
-	/* The following loop checks looping state if -i option given */
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset tst_count in case we are looping */
-		tst_count = 0;
-
-		for (i = 0; i < TST_TOTAL; i++) {
-
-			if (TC[i] == IPC_SET) {
-				arg.buf = &perm;
-				memset(&perm, 0, sizeof perm);
-				perm.sem_perm.uid = getuid() + 1;
-				perm.sem_perm.gid = getgid() + 1;
-				perm.sem_perm.mode = 0666;
-			}
-
-			TEST(semctl(sem_id_1, 0, TC[i], arg));
+	pid_t pid;
 
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "call succeeded unexpectedly");
-				continue;
-			}
+	pid = SAFE_FORK();
 
-			switch (TEST_ERRNO) {
-			case EPERM:
-				tst_resm(TPASS, "expected failure - errno ="
-					 " %d : %s", TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-				break;
-			default:
-				tst_resm(TFAIL, "unexpected error "
-					 "- %d : %s", TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-				break;
-			}
-		}
+	if (pid == 0) {
+		SAFE_SETEUID(ltp_uid);
+		do_child();
+	} else {
+		SAFE_WAITPID(pid, NULL, 0);
 	}
 }
 
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
+static void setup(void)
 {
-	tst_require_root();
-
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
+	static key_t semkey;
 
-	/*
-	 * Create a temporary directory and cd into it.
-	 * This helps to ensure that a unique msgkey is created.
-	 * See libs/libltpipc/libipc.c for more information.
-	 */
-	tst_tmpdir();
+	semkey = GETIPCKEY();
 
-	/* get an IPC resource key */
-	semkey = getipckey();
+	sem_id = SAFE_SEMGET(semkey, PSEMS, IPC_CREAT | IPC_EXCL);
 
-	/* create a semaphore set without read or alter permissions */
-	if ((sem_id_1 = semget(semkey, PSEMS, IPC_CREAT | IPC_EXCL)) == -1) {
-		tst_brkm(TBROK, cleanup, "couldn't create semaphore in setup");
-	}
-
-	/* get the userid for a non root user */
-	ltp_uid = getuserid(ltp_user);
+	struct passwd *ltpuser = SAFE_GETPWNAM("nobody");
+	ltp_uid = ltpuser->pw_uid;
 }
 
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void cleanup(void)
+static void cleanup(void)
 {
-
+	if (sem_id != -1)
+		SAFE_SEMCTL(sem_id, 0, IPC_RMID);
 }
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.forks_child = 1,
+	.needs_root = 1,
+	.test_all = verify_semctl,
+};