@@ -1,112 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0
/*
-* Copyright (c) International Business Machines Corp., 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: pidns10.c
-* *
-* * Description:
-* * The pidns10.c testcase verifies inside the container, if kill(-1, signal)
-* * fails with ESRCH when there are no processes in container.
-* *
-* * Test Assertion & Strategy:
-* * Create a PID namespace container.
-* * Invoke kill(-1, SIGUSR1) inside container and check return code and error.
-* * kill() should have failed;except swapper & init, no process is inside.
-* *
-* * Usage: <for command-line>
-* * pidns10
-* *
-* * History:
-* * DATE NAME DESCRIPTION
-* * 13/11/08 Gowrishankar M Creation of this test.
-* * <gowrishankar.m@in.ibm.com>
-*
-******************************************************************************/
-#define _GNU_SOURCE 1
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include "pidns_helper.h"
-#include "test.h"
-
-char *TCID = "pidns10";
-int TST_TOTAL = 1;
+ * Copyright (C) International Business Machines Corp., 2008
+ * Copyright (C) 2022 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
-int child_fn(void *);
+/*\
+ * [Description]
+ *
+ * Clone a process with CLONE_NEWPID flag and check that killing subprocesses
+ * from child namespace will raise ESRCH error.
+ */
-#define CHILD_PID 1
-#define PARENT_PID 0
+#include "tst_test.h"
+#include "lapi/sched.h"
-/*
- * child_fn() - Inside container
- */
-int child_fn(void *arg)
+static void child_func(void)
{
- int exit_val, ret;
- pid_t pid, ppid;
+ pid_t cpid = getpid();
+ pid_t ppid = getppid();
- /* Set process id and parent pid */
- pid = getpid();
- ppid = getppid();
- if (pid != CHILD_PID || ppid != PARENT_PID) {
- printf("cinit: pidns was not created.\n");
- return 1;
- }
+ TST_EXP_EQ_LI(cpid, 1);
+ TST_EXP_EQ_LI(ppid, 0);
- if ((ret = kill(-1, SIGUSR1)) == -1 && errno == ESRCH) {
- printf("cinit: kill(-1, sig) failed with -1 / ESRCH as "
- "expected\n");
- exit_val = 0;
- } else {
- printf("cinit: kill(-1, sig) didn't fail with -1 / ESRCH "
- "(%d); failed with %d / %d instead", ESRCH, ret, errno);
- exit_val = 1;
- }
- exit(exit_val);
-}
+ tst_res(TINFO, "Trying to kill all subprocesses from within container");
-static void setup(void)
-{
- tst_require_root();
- check_newpid();
+ TST_EXP_FAIL(kill(-1, SIGKILL), ESRCH);
}
-int main(void)
+static void run(void)
{
- int status;
- pid_t pid;
-
- setup();
+ const struct tst_clone_args args = { CLONE_NEWPID, SIGCHLD };
- pid = getpid();
-
- /* Container creation on PID namespace */
- TEST(do_clone_unshare_test(T_CLONE, CLONE_NEWPID, child_fn, NULL));
- if (TEST_RETURN == -1) {
- tst_brkm(TBROK | TTERRNO, NULL, "clone failed");
+ if (!SAFE_CLONE(&args)) {
+ child_func();
+ return;
}
-
- sleep(1);
- if (wait(&status) < 0)
- tst_resm(TWARN, "parent: waitpid() failed.");
-
- if (WIFEXITED(status) && WEXITSTATUS(status) != 0)
- tst_resm(TBROK, "container was terminated abnormally");
-
- tst_exit();
}
+
+static struct tst_test test = {
+ .test_all = run,
+ .needs_root = 1,
+ .forks_child = 1,
+};
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com> --- Using SAFE_CLONE Using TST_EXP_* macros testcases/kernel/containers/pidns/pidns10.c | 128 +++++--------------- 1 file changed, 30 insertions(+), 98 deletions(-)