[LTP] [PATCH 0/2] syscalls/unshare: convert unshare to the new API

[LTP] [PATCH 0/2] syscalls/unshare: convert unshare to the new API

[Xie Ziyao]

Xie Ziyao (2):
  convert unshare01 to the new API
  convert unshare02 to the new API

 testcases/kernel/syscalls/unshare/unshare01.c | 304 ++----------------
 testcases/kernel/syscalls/unshare/unshare02.c | 231 ++-----------
 2 files changed, 68 insertions(+), 467 deletions(-)

--
2.17.1

[LTP] [PATCH 1/2] syscalls/unshare: convert unshare01 to the new API

[Xie Ziyao]

1. Convert unshare01 to the new API;
2. Check whether the returned value of unshare() is correct in the
child process instead of the parent process.

Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
 testcases/kernel/syscalls/unshare/unshare01.c | 304 ++----------------
 1 file changed, 34 insertions(+), 270 deletions(-)

diff --git a/testcases/kernel/syscalls/unshare/unshare01.c b/testcases/kernel/syscalls/unshare/unshare01.c
index 52c774530..c5768afd3 100644
--- a/testcases/kernel/syscalls/unshare/unshare01.c
+++ b/testcases/kernel/syscalls/unshare/unshare01.c
@@ -1,291 +1,55 @@
-/*************************************************************************/
-/* Copyright (c) Crackerjack Project., 2007				 */
-/*									 */
-/* 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*/
-/*									 */
-/*************************************************************************/
-/*************************************************************************/
-/*									 */
-/* File:	unshare01.c					   	 */
-/*									 */
-/* Description: This tests the unshare() syscall.		      	 */
-/*	     unshare() allows a process to disassociate parts of its	 */
-/*		execution context that are currently being shared with other 	*/
-/*		processes. Part of the execution context, such as the namespace	*/
-/*		,is shared implicitly when a new process is created using 	*/
-/*		fork(2) or vfork(2), while other parts, such as virtual memory	*/
-/*		, may be shared by explicit request when creating a process 	*/
-/*		using clone(2).							*/
-/*										*/
-/*		The main use of unshare() is to allow a process to control its	*/
-/*		shared execution context without creating a new process.	*/
-/*		 								*/
-/*										*/
-/*		The flags argument is a bit mask that specifies which parts of	*/
-/*		the execution context should be unshared. This argument is 	*/
-/*		specified by ORing together zero or more of the following cons-	*/
-/*		tants:								*/
-/*										*/
-/*		CLONE_FILES:							*/
-/*		    	Reverse the effect of the clone(2) CLONE_FILES flag. 	*/
-/*			Unshare	the file descriptor table, so that the calling 	*/
-/*			process no longer shares its file descriptors with any 	*/
-/*			other process.						*/
-/*		CLONE_FS:							*/
-/*			Reverse the effect of the clone(2) CLONE_FS flag.Unshare*/
-/*			file system attributes, so that the calling process no 	*/
-/*			longer shares its root directory, current directory, or	*/
-/*			umask attributes with any other process.		*/
-/*		CLONE_NEWNS:							*/
-/*		       This flag has the same effect as the clone(2) CLONE_NEWNS*/
-/*			flag. Unshare the namespace, so that the calling process*/
-/*			has a private copy of its namespacei which is not shared*/
-/*			with any other process. Specifying this flag automat-	*/
-/*			ically implies CLONE_FS as well. 			*/
-/*										*/
-/*		If flags is specified as zero, then unshare() is a no-op; no 	*/
-/*		changes are made to the calling process's execution context. 	*/
-/*									       	*/
-/* Usage:  <for command-line>						 	*/
-/* unshare01 [-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.					*/
-/*									    	*/
-/* Total Tests: 1							     	*/
-/*									    	*/
-/* Test Name:   unshare01					     		*/
-/* History:     Porting from Crackerjack to LTP is done by		    	*/
-/*	      Manas Kumar Nayak maknayak@in.ibm.com>				*/
-/********************************************************************************/
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Crackerjack Project., 2007
+ * Ported from Crackerjack to LTP by Manas Kumar Nayak maknayak@in.ibm.com>
+ */
+
+/*
+ * [Description]
+ *
+ * Basic tests for the unshare() syscall.
+ */

 #define _GNU_SOURCE

 #include <stdio.h>
 #include <sys/wait.h>
 #include <sys/types.h>
+#include <sys/param.h>
+#include <sys/syscall.h>
 #include <sched.h>
 #include <limits.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
-#include <string.h>
-#include <sys/param.h>
-#include <stdio.h>

-#include "test.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "config.h"

-char *TCID = "unshare01";
-int testno;
-int TST_TOTAL = 1;
-
 #ifdef HAVE_UNSHARE

-/* Extern Global Functions */
-/******************************************************************************/
-/*									    */
-/* Function:    cleanup						       */
-/*									    */
-/* Description: Performs all one time clean up for this test on successful    */
-/*	      completion,  premature exit or  failure. Closes all temporary */
-/*	      files, removes all temporary directories exits the test with  */
-/*	      appropriate return code by calling tst_exit() function.       */
-/*									    */
-/* Input:       None.							 */
-/*									    */
-/* Output:      None.							 */
-/*									    */
-/* Return:      On failure - Exits calling tst_exit(). Non '0' return code.   */
-/*	      On success - Exits calling tst_exit(). With '0' return code.  */
-/*									    */
-/******************************************************************************/
-void cleanup(void)
-{
-
-	tst_rmdir();
-}
+static struct test_case_t {
+	int mode;
+	const char *desc;
+} TC[] = {
+	{CLONE_FILES,	"CLONE_FILES"},
+	{CLONE_FS,	"CLONE_FS"},
+	{CLONE_NEWNS,	"CLONE_NEWNS"},
+};

-/* Local  Functions */
-/******************************************************************************/
-/*									    */
-/* Function:    setup							 */
-/*									    */
-/* Description: Performs all one time setup for this test. This function is   */
-/*	      typically used to capture signals, create temporary dirs      */
-/*	      and temporary files that may be used in the course of this    */
-/*	      test.							 */
-/*									    */
-/* Input:       None.							 */
-/*									    */
-/* Output:      None.							 */
-/*									    */
-/* Return:      On failure - Exits by calling cleanup().		      */
-/*	      On success - returns 0.				       */
-/*									    */
-/******************************************************************************/
-void setup(void)
+static void run(unsigned int i)
 {
-	tst_require_root();
-
-	/* Capture signals if any */
-	/* Create temporary directories */
-	TEST_PAUSE;
-	tst_tmpdir();
+	pid_t pid = SAFE_FORK();
+	if (pid == 0)
+		TST_EXP_PASS(unshare(TC[i].mode), "unshare(%s)", TC[i].desc);
 }

-int main(int ac, char **av)
-{
-	pid_t pid1;
-	int lc;
-	int rval;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-
-			pid1 = fork();	//call to fork()
-			if (pid1 == -1) {
-				tst_brkm(TFAIL | TERRNO, cleanup,
-					 "fork failed");
-			} else if (pid1 == 0) {
-				switch (unshare(CLONE_FILES)) {
-				case 0:
-					printf("unshare with CLONE_FILES call "
-					       "succeeded\n");
-					rval = 0;
-					break;
-				case -1:
-					if (errno == ENOSYS)
-						rval = 1;
-					else {
-						perror("unshare failed");
-						rval = 2;
-					}
-				}
-				exit(rval);
-			} else {
-				SAFE_WAIT(cleanup, &rval);
-				if (rval != 0 && WIFEXITED(rval)) {
-					switch (WEXITSTATUS(rval)) {
-					case 1:
-						tst_brkm(TCONF, cleanup,
-							 "unshare not supported in "
-							 "kernel");
-						break;
-					default:
-						tst_brkm(TFAIL, cleanup,
-							 "unshare failed");
-					}
-				}
-			}
-
-			pid1 = fork();
-			if (pid1 == -1) {
-				tst_brkm(TFAIL | TERRNO, cleanup,
-					 "fork failed");
-			} else if (pid1 == 0) {
-				switch (unshare(CLONE_FS)) {
-				case 0:
-					printf("unshare with CLONE_FS call "
-					       "succeeded\n");
-					rval = 0;
-					break;
-				case -1:
-					if (errno == ENOSYS)
-						rval = 1;
-					else {
-						perror("unshare failed");
-						rval = 2;
-					}
-				}
-				exit(rval);
-			} else {
-				SAFE_WAIT(cleanup, &rval);
-				if (rval != 0 && WIFEXITED(rval)) {
-					switch (WEXITSTATUS(rval)) {
-					case 1:
-						tst_brkm(TCONF, cleanup,
-							 "unshare not supported in "
-							 "kernel");
-						break;
-					default:
-						tst_brkm(TFAIL, cleanup,
-							 "unshare failed");
-					}
-				}
-			}
-
-			pid1 = fork();
-			if (pid1 == -1) {
-				tst_brkm(TFAIL | TERRNO, cleanup,
-					 "fork() failed.");
-			} else if (pid1 == 0) {
-				switch (unshare(CLONE_NEWNS)) {
-				case 0:
-					printf("unshare call with CLONE_NEWNS "
-					       "succeeded\n");
-					rval = 0;
-					break;
-				case -1:
-					if (errno == ENOSYS)
-						rval = 1;
-					else {
-						perror("unshare failed");
-						rval = 2;
-					}
-				}
-				exit(rval);
-			} else {
-				SAFE_WAIT(cleanup, &rval);
-				if (rval != 0 && WIFEXITED(rval)) {
-					switch (WEXITSTATUS(rval)) {
-					case 1:
-						tst_brkm(TCONF, cleanup,
-							 "unshare not supported in "
-							 "kernel");
-						break;
-					default:
-						tst_brkm(TFAIL, cleanup,
-							 "unshare failed");
-					}
+static struct tst_test test = {
+	.tcnt = ARRAY_SIZE(TC),
+	.forks_child = 1,
+	.needs_tmpdir = 1,
+	.needs_root = 1,
+	.test = run,
+};

-				}
-
-			}
-
-		}
-
-	}
-	cleanup();
-	tst_exit();
-}
 #else
-int main(void)
-{
-	tst_brkm(TCONF, NULL, "unshare is undefined.");
-}
+TST_TEST_TCONF("unshare is undefined.");
 #endif
--
2.17.1

[LTP] [PATCH 2/2] syscalls/unshare: convert unshare02 to the new API

[Xie Ziyao]

1. Convert unshare02 to the new API;
2. Check whether the returned value is correct in the child process
instead of the parent process;
3. Add a test case: use the CLONE_NEWNS parameter as a non-root user
and the expected return value is EPERM.

Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
 testcases/kernel/syscalls/unshare/unshare02.c | 231 +++---------------
 1 file changed, 34 insertions(+), 197 deletions(-)

diff --git a/testcases/kernel/syscalls/unshare/unshare02.c b/testcases/kernel/syscalls/unshare/unshare02.c
index 18b8bf522..b4cb74104 100644
--- a/testcases/kernel/syscalls/unshare/unshare02.c
+++ b/testcases/kernel/syscalls/unshare/unshare02.c
@@ -1,218 +1,55 @@
-/******************************************************************************/
-/* Copyright (c) Crackerjack Project., 2007				   */
-/*									    */
-/* 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    */
-/*									    */
-/******************************************************************************/
-/******************************************************************************/
-/*									    */
-/* File:	unshare02.c						   */
-/*									    */
-/* Description: This tests the unshare error() syscall			*/
-/*									    */
-/* Usage:  <for command-line>						 */
-/* unshare02 [-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.				*/
-/*									    */
-/* Total Tests: 2							     */
-/*									    */
-/* Test Name:   unshare02						     */
-/* History:     Porting from Crackerjack to LTP is done by		    */
-/*	      Manas Kumar Nayak maknayak@in.ibm.com>			*/
-/******************************************************************************/
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Crackerjack Project., 2007
+ * Ported from Crackerjack to LTP by Manas Kumar Nayak maknayak@in.ibm.com>
+ */
+
+/*
+ * [Description]
+ *
+ * Basic tests for the unshare error() syscall.
+ */

 #define _GNU_SOURCE

 #include <stdio.h>
 #include <sys/wait.h>
 #include <sys/types.h>
+#include <sys/param.h>
+#include <sys/syscall.h>
 #include <sched.h>
 #include <limits.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
-#include <string.h>
-#include <sys/param.h>
-#include <stdio.h>

-#include "test.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "config.h"

-char *TCID = "unshare02";
-int testno;
-int TST_TOTAL = 2;
-
 #ifdef HAVE_UNSHARE

-/* Extern Global Functions */
-/******************************************************************************/
-/*									    */
-/* Function:    cleanup						       */
-/*									    */
-/* Description: Performs all one time clean up for this test on successful    */
-/*	      completion,  premature exit or  failure. Closes all temporary */
-/*	      files, removes all temporary directories exits the test with  */
-/*	      appropriate TEST_RETURNurn code by calling tst_exit() function.       */
-/*									    */
-/* Input:       None.							 */
-/*									    */
-/* Output:      None.							 */
-/*									    */
-/* Return:      On failure - Exits calling tst_exit(). Non '0' TEST_RETURNurn code.   */
-/*	      On success - Exits calling tst_exit(). With '0' TEST_RETURNurn code.  */
-/*									    */
-/******************************************************************************/
-void cleanup(void)
-{
-
-	tst_rmdir();
+static struct test_case_t {
+	int mode;
+	int expected_error;
+	const char *desc;
+} TC[] = {
+	{-1, EINVAL, "-1"},
+	{CLONE_NEWNS, EPERM, "CLONE_NEWNS"}
+};

-	/* Exit with appropriate TEST_RETURNurn code. */
-
-}
-
-/* Local  Functions */
-/******************************************************************************/
-/*									    */
-/* Function:    setup							 */
-/*									    */
-/* Description: Performs all one time setup for this test. This function is   */
-/*	      typically used to capture signals, create temporary dirs      */
-/*	      and temporary files that may be used in the course of this    */
-/*	      test.							 */
-/*									    */
-/* Input:       None.							 */
-/*									    */
-/* Output:      None.							 */
-/*									    */
-/* Return:      On failure - Exits by calling cleanup().		      */
-/*	      On success - TEST_RETURNurns 0.				       */
-/*									    */
-/******************************************************************************/
-void setup(void)
+static void run(unsigned int i)
 {
-	/* Capture signals if any */
-	/* Create temporary directories */
-	TEST_PAUSE;
-	tst_tmpdir();
+	pid_t pid = SAFE_FORK();
+	if (pid == 0)
+		TST_EXP_FAIL(unshare(TC[i].mode), TC[i].expected_error,
+			     "unshare(%s)", TC[i].desc);
 }

-int main(int ac, char **av)
-{
-	pid_t pid1;
-	int lc;
-	int rval;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
+static struct tst_test test = {
+	.tcnt = ARRAY_SIZE(TC),
+	.forks_child = 1,
+	.needs_tmpdir = 1,
+	.test = run,
+};

-			TEST(pid1 = fork());	//call to fork()
-			if (TEST_RETURN == -1) {
-				tst_brkm(TFAIL | TTERRNO, cleanup,
-					 "fork() failed.");
-			} else if (TEST_RETURN == 0) {
-				TEST_RETURN = unshare(-1);
-				if (TEST_RETURN == 0) {
-					printf("Call unexpectedly succeeded\n");
-					rval = 1;
-				} else if (TEST_RETURN == -1) {
-					if (errno == EINVAL) {
-						printf("Got EINVAL\n");
-						rval = 0;
-					} else if (errno == ENOSYS) {
-						rval = 1;
-					} else {
-						perror("unshare failed");
-						rval = 2;
-					}
-				}
-				exit(rval);
-			} else {
-				SAFE_WAIT(cleanup, &rval);
-				if (rval != 0 && WIFEXITED(rval)) {
-					switch (WEXITSTATUS(rval)) {
-					case 1:
-						tst_brkm(TBROK, cleanup,
-							 "unshare call unsupported "
-							 "in kernel");
-						break;
-					case 2:
-						tst_brkm(TFAIL, cleanup,
-							 "unshare call failed");
-						break;
-					}
-				}
-			}
-
-			TEST(pid1 = fork());	//call to fork()
-			if (pid1 == -1) {
-				tst_brkm(TFAIL | TTERRNO, cleanup,
-					 "fork() failed.");
-			} else if (TEST_RETURN == 0) {
-				TEST_RETURN = unshare(0);
-				if (TEST_RETURN == 0) {
-					tst_resm(TPASS, "Call succeeded");
-					rval = 0;
-				} else if (TEST_RETURN == -1) {
-					if (errno == ENOSYS)
-						rval = 1;
-					else {
-						perror("unshare failed");
-						rval = 2;
-					}
-				}
-				exit(rval);
-			} else {
-				SAFE_WAIT(cleanup, &rval);
-				if (rval != 0 && WIFEXITED(rval)) {
-					switch (WEXITSTATUS(rval)) {
-					case 1:
-						tst_brkm(TBROK, cleanup,
-							 "unshare call unsupported "
-							 "in kernel");
-						break;
-					case 2:
-						tst_brkm(TFAIL, cleanup,
-							 "unshare call failed");
-						break;
-					}
-				}
-			}
-
-		}
-	}
-	cleanup();
-	tst_exit();
-}
 #else
-int main(void)
-{
-	tst_brkm(TCONF, NULL, "unshare is undefined.");
-}
+TST_TEST_TCONF("unshare is undefined.");
 #endif
--
2.17.1

[LTP] [PATCH 1/2] syscalls/unshare: convert unshare01 to the new API

[Cyril Hrubis]

Hi!
Great cleanup, pushed with a minor change, thanks.

I've renamed the TC to tc since uppercase names are usually used for
macros and not for variables.

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH 2/2] syscalls/unshare: convert unshare02 to the new API

[Cyril Hrubis]

Hi!
> 1. Convert unshare02 to the new API;
> 2. Check whether the returned value is correct in the child process
> instead of the parent process;
> 3. Add a test case: use the CLONE_NEWNS parameter as a non-root user
> and the expected return value is EPERM.

The EPERM check fails if the test is executed by a root. LTP tests
usually setuid() to "nobody" for EPERM tests if executed as a root.

The TC should be lowercase but that is very minor.

Apart from these it's a really good cleanup.

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH v2] syscalls/unshare: Convert unshare02 to the new API

[Xie Ziyao]

1. Convert unshare02 to the new API;
2. Check whether the returned value is correct in the child process
instead of the parent process;
3. Add a test case: use the CLONE_NEWNS parameter as a non-root user
and the expected return value is EPERM.

Signed-off-by: Xie Ziyao <xieziyao@huawei.com>
---
v1->v2:
1. Add setup() and cleanup() to set uid to "nobody" for EPERM tests;
2. Modify the incorrect code style.

 testcases/kernel/syscalls/unshare/unshare02.c | 236 ++++--------------
 1 file changed, 44 insertions(+), 192 deletions(-)

diff --git a/testcases/kernel/syscalls/unshare/unshare02.c b/testcases/kernel/syscalls/unshare/unshare02.c
index 18b8bf522..83cbdc599 100644
--- a/testcases/kernel/syscalls/unshare/unshare02.c
+++ b/testcases/kernel/syscalls/unshare/unshare02.c
@@ -1,218 +1,70 @@
-/******************************************************************************/
-/* Copyright (c) Crackerjack Project., 2007				   */
-/*									    */
-/* 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    */
-/*									    */
-/******************************************************************************/
-/******************************************************************************/
-/*									    */
-/* File:	unshare02.c						   */
-/*									    */
-/* Description: This tests the unshare error() syscall			*/
-/*									    */
-/* Usage:  <for command-line>						 */
-/* unshare02 [-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.				*/
-/*									    */
-/* Total Tests: 2							     */
-/*									    */
-/* Test Name:   unshare02						     */
-/* History:     Porting from Crackerjack to LTP is done by		    */
-/*	      Manas Kumar Nayak maknayak@in.ibm.com>			*/
-/******************************************************************************/
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Crackerjack Project., 2007
+ * Ported from Crackerjack to LTP by Manas Kumar Nayak maknayak@in.ibm.com>
+ */
+
+/*
+ * [Description]
+ *
+ * Basic tests for the unshare error() syscall.
+ */

 #define _GNU_SOURCE

 #include <stdio.h>
 #include <sys/wait.h>
 #include <sys/types.h>
+#include <sys/param.h>
+#include <sys/syscall.h>
 #include <sched.h>
 #include <limits.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <errno.h>
 #include <pwd.h>
-#include <grp.h>
-#include <string.h>
-#include <sys/param.h>
-#include <stdio.h>

-#include "test.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "config.h"

-char *TCID = "unshare02";
-int testno;
-int TST_TOTAL = 2;
-
 #ifdef HAVE_UNSHARE

-/* Extern Global Functions */
-/******************************************************************************/
-/*									    */
-/* Function:    cleanup						       */
-/*									    */
-/* Description: Performs all one time clean up for this test on successful    */
-/*	      completion,  premature exit or  failure. Closes all temporary */
-/*	      files, removes all temporary directories exits the test with  */
-/*	      appropriate TEST_RETURNurn code by calling tst_exit() function.       */
-/*									    */
-/* Input:       None.							 */
-/*									    */
-/* Output:      None.							 */
-/*									    */
-/* Return:      On failure - Exits calling tst_exit(). Non '0' TEST_RETURNurn code.   */
-/*	      On success - Exits calling tst_exit(). With '0' TEST_RETURNurn code.  */
-/*									    */
-/******************************************************************************/
-void cleanup(void)
-{
-
-	tst_rmdir();
-
-	/* Exit with appropriate TEST_RETURNurn code. */
+static struct test_case_t {
+	int mode;
+	int expected_error;
+	const char *desc;
+} tc[] = {
+	{-1, EINVAL, "-1"},
+	{CLONE_NEWNS, EPERM, "CLONE_NEWNS"}
+};

+static void run(unsigned int i)
+{
+	pid_t pid = SAFE_FORK();
+	if (pid == 0)
+		TST_EXP_FAIL(unshare(tc[i].mode), tc[i].expected_error,
+			     "unshare(%s)", tc[i].desc);
 }

-/* Local  Functions */
-/******************************************************************************/
-/*									    */
-/* Function:    setup							 */
-/*									    */
-/* Description: Performs all one time setup for this test. This function is   */
-/*	      typically used to capture signals, create temporary dirs      */
-/*	      and temporary files that may be used in the course of this    */
-/*	      test.							 */
-/*									    */
-/* Input:       None.							 */
-/*									    */
-/* Output:      None.							 */
-/*									    */
-/* Return:      On failure - Exits by calling cleanup().		      */
-/*	      On success - TEST_RETURNurns 0.				       */
-/*									    */
-/******************************************************************************/
-void setup(void)
+static void setup(void)
 {
-	/* Capture signals if any */
-	/* Create temporary directories */
-	TEST_PAUSE;
-	tst_tmpdir();
+	struct passwd *ltpuser = SAFE_GETPWNAM("nobody");
+	SAFE_SETEUID(ltpuser->pw_uid);
 }

-int main(int ac, char **av)
+static void cleanup(void)
 {
-	pid_t pid1;
-	int lc;
-	int rval;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-
-			TEST(pid1 = fork());	//call to fork()
-			if (TEST_RETURN == -1) {
-				tst_brkm(TFAIL | TTERRNO, cleanup,
-					 "fork() failed.");
-			} else if (TEST_RETURN == 0) {
-				TEST_RETURN = unshare(-1);
-				if (TEST_RETURN == 0) {
-					printf("Call unexpectedly succeeded\n");
-					rval = 1;
-				} else if (TEST_RETURN == -1) {
-					if (errno == EINVAL) {
-						printf("Got EINVAL\n");
-						rval = 0;
-					} else if (errno == ENOSYS) {
-						rval = 1;
-					} else {
-						perror("unshare failed");
-						rval = 2;
-					}
-				}
-				exit(rval);
-			} else {
-				SAFE_WAIT(cleanup, &rval);
-				if (rval != 0 && WIFEXITED(rval)) {
-					switch (WEXITSTATUS(rval)) {
-					case 1:
-						tst_brkm(TBROK, cleanup,
-							 "unshare call unsupported "
-							 "in kernel");
-						break;
-					case 2:
-						tst_brkm(TFAIL, cleanup,
-							 "unshare call failed");
-						break;
-					}
-				}
-			}
+	SAFE_SETEUID(0);
+}

-			TEST(pid1 = fork());	//call to fork()
-			if (pid1 == -1) {
-				tst_brkm(TFAIL | TTERRNO, cleanup,
-					 "fork() failed.");
-			} else if (TEST_RETURN == 0) {
-				TEST_RETURN = unshare(0);
-				if (TEST_RETURN == 0) {
-					tst_resm(TPASS, "Call succeeded");
-					rval = 0;
-				} else if (TEST_RETURN == -1) {
-					if (errno == ENOSYS)
-						rval = 1;
-					else {
-						perror("unshare failed");
-						rval = 2;
-					}
-				}
-				exit(rval);
-			} else {
-				SAFE_WAIT(cleanup, &rval);
-				if (rval != 0 && WIFEXITED(rval)) {
-					switch (WEXITSTATUS(rval)) {
-					case 1:
-						tst_brkm(TBROK, cleanup,
-							 "unshare call unsupported "
-							 "in kernel");
-						break;
-					case 2:
-						tst_brkm(TFAIL, cleanup,
-							 "unshare call failed");
-						break;
-					}
-				}
-			}
+static struct tst_test test = {
+	.tcnt = ARRAY_SIZE(tc),
+	.forks_child = 1,
+	.needs_tmpdir = 1,
+	.needs_root = 1,
+	.cleanup = cleanup,
+	.setup = setup,
+	.test = run,
+};

-		}
-	}
-	cleanup();
-	tst_exit();
-}
 #else
-int main(void)
-{
-	tst_brkm(TCONF, NULL, "unshare is undefined.");
-}
+TST_TEST_TCONF("unshare is undefined.");
 #endif
--
2.17.1

[LTP] [PATCH 2/2] syscalls/unshare: convert unshare02 to the new API

[xieziyao]

Hi,

I just re-checked the latest code and made changes on your suggestions:
1. Add setup() and cleanup() to set uid to "nobody" for EPERM tests;
2. Modify the incorrect code style.

Please see: https://patchwork.ozlabs.org/project/ltp/patch/20210420072939.202584-1-xieziyao@huawei.com/

Thanks so much for your review!

Best Regards,
Ziyao

-----Original Message-----
From: Cyril Hrubis [mailto:chrubis@suse.cz] 
Sent: Monday, April 19, 2021 10:08 PM
To: xieziyao <xieziyao@huawei.com>
Cc: ltp@lists.linux.it
Subject: Re: [LTP] [PATCH 2/2] syscalls/unshare: convert unshare02 to the new API

Hi!
> 1. Convert unshare02 to the new API;
> 2. Check whether the returned value is correct in the child process 
> instead of the parent process; 3. Add a test case: use the CLONE_NEWNS 
> parameter as a non-root user and the expected return value is EPERM.

The EPERM check fails if the test is executed by a root. LTP tests usually setuid() to "nobody" for EPERM tests if executed as a root.

The TC should be lowercase but that is very minor.

Apart from these it's a really good cleanup.

--
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH v2] syscalls/unshare: Convert unshare02 to the new API

[Cyril Hrubis]

Hi!
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) Crackerjack Project., 2007
> + * Ported from Crackerjack to LTP by Manas Kumar Nayak maknayak@in.ibm.com>
> + */
> +
> +/*
> + * [Description]
> + *
> + * Basic tests for the unshare error() syscall.
> + */

Pushed with slight modification to the description, thanks.

Also please note that the special description comment has to start with
/*\ instead of just /* in order to be picked up by docparser.

-- 
Cyril Hrubis
chrubis@suse.cz