[LTP] [PATCH 2/2] syscalls/unshare: convert unshare02 to the new API
Xie Ziyao
xieziyao@huawei.com
Mon Apr 19 14:22:46 CEST 2021
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
More information about the ltp
mailing list