@@ -1,169 +1,71 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
-* 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: pidns12.c
-* *
-* * Description:
-* * The pidns12.c testcase verifies that siginfo->si_pid is set to 0
-* * if sender (parent process) is not in receiver's namespace.
-* *
-* * Test Assertion & Strategy:
-* * Create a PID namespace container.
-* * Initialise signal handler for SIGUSR1 in container.
-* * Let parent send SIGUSR1 to container.
-* * Check if sender pid is set to 0 from signal info.
-* *
-* * Usage: <for command-line>
-* * pidns12
-* *
-* * 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 <signal.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include "pidns_helper.h"
-#include "test.h"
+ * Copyright (c) International Business Machines Corp., 2007
+ * 13/11/08 Gowrishankar M <gowrishankar.m@in.ibm.com>
+ * Copyright (C) 2022 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
-char *TCID = "pidns12";
-int TST_TOTAL = 1;
-int pipefd[2];
+/*\
+ * [Description]
+ *
+ * Clone a process with CLONE_NEWPID flag and verifies that siginfo->si_pid is
+ * set to 0 if sender (parent process) is not in the receiver's namespace.
+ */
-#define CHILD_PID 1
-#define PARENT_PID 0
+#define _GNU_SOURCE 1
+#include <signal.h>
+#include "tst_test.h"
+#include "lapi/namespaces_constants.h"
-/*
- * child_signal_handler() - dummy function for sigaction()
- */
-static void child_signal_handler(int sig, siginfo_t * si, void *unused)
+static void child_signal_handler(LTP_ATTRIBUTE_UNUSED int sig, siginfo_t *si, LTP_ATTRIBUTE_UNUSED void *unused)
{
- /* Recieved SIGUSR1. Check sender pid */
if (si->si_pid == 0)
- tst_resm(TPASS, "cinit: signalling PID (from other namespace)"
- " is 0 as expected");
+ tst_res(TPASS, "signalling PID (from other namespace) is 0 as expected");
else
- tst_resm(TFAIL, "cinit: signalling PID (from other namespace)"
- " is not 0, but %d.", si->si_pid);
+ tst_res(TFAIL, "signalling PID (from other namespace) is not 0, but %d.", si->si_pid);
}
-/*
- * child_fn() - Inside container
- */
-int child_fn(void *arg)
+static int child_func(LTP_ATTRIBUTE_UNUSED void *arg)
{
struct sigaction sa;
- pid_t pid, ppid;
+ pid_t cpid, ppid;
- /* Set process id and parent pid */
- pid = getpid();
+ cpid = getpid();
ppid = getppid();
- if (pid != CHILD_PID || ppid != PARENT_PID) {
- tst_resm(TBROK, "cinit: pidns is not created.");
- }
- /* Close read end of pipe */
- close(pipefd[0]);
+ if (cpid != 1 || ppid != 0) {
+ tst_res(TFAIL, "Got unexpected result of cpid=%d ppid=%d", cpid, ppid);
+ return 1;
+ }
- /* Set signal handler for SIGUSR1 */
sa.sa_flags = SA_SIGINFO;
- sigfillset(&sa.sa_mask);
+ SAFE_SIGFILLSET(&sa.sa_mask);
sa.sa_sigaction = child_signal_handler;
- if (sigaction(SIGUSR1, &sa, NULL) == -1) {
- tst_resm(TBROK, "cinit: sigaction() failed(%s).",
- strerror(errno));
- }
-
- /* Let parent to signal SIGUSR1 */
- if (write(pipefd[1], "c:go\0", 5) != 5) {
- tst_resm(TBROK, "cinit: pipe is broken to write");
- }
-
- sleep(3);
- /* cleanup and exit */
- close(pipefd[1]);
+ SAFE_SIGACTION(SIGUSR1, &sa, NULL);
- /* Control won't reach below */
- exit(0);
-}
+ TST_CHECKPOINT_WAKE_AND_WAIT(0);
-static void setup(void)
-{
- tst_require_root();
- check_newpid();
+ return 0;
}
-/***********************************************************************
-* M A I N
-***********************************************************************/
-
-int main(void)
+static void run(void)
{
- int status;
- pid_t pid, cpid;
- char buf[5];
-
- setup();
-
- pid = getpid();
- tst_resm(TINFO, "parent: PID is %d", pid);
-
- /* Create pipe for intercommunication */
- if (pipe(pipefd) == -1) {
- tst_resm(TBROK, "parent: pipe() failed. aborting!");
- }
-
- cpid = ltp_clone_quick(CLONE_NEWPID | SIGCHLD, child_fn, NULL);
- if (cpid < 0) {
- tst_resm(TBROK, "parent: clone() failed(%s).", strerror(errno));
- }
-
- /* Close write end of pipe */
- close(pipefd[1]);
-
- /* Check if container is ready */
- read(pipefd[0], buf, 5);
- if (strcmp(buf, "c:go") != 0) {
- tst_resm(TBROK, "parent: container did not respond!");
- }
+ int ret;
- /* Send SIGUSR1 to container init */
- if (kill(cpid, SIGUSR1) == -1) {
- tst_resm(TBROK, "parent: kill() failed(%s).", strerror(errno));
- }
-
- if (waitpid(cpid, &status, 0) < 0)
- tst_resm(TWARN, "parent: waitpid() failed(%s).",
- strerror(errno));
+ ret = ltp_clone_quick(CLONE_NEWPID | SIGCHLD, child_func, NULL);
+ if (ret < 0)
+ tst_brk(TBROK | TERRNO, "clone failed");
- if (WIFSIGNALED(status) && WTERMSIG(status))
- tst_resm(TBROK, "child is terminated by signal(%s)",
- strsignal(WTERMSIG(status)));
+ TST_CHECKPOINT_WAIT(0);
- /* Cleanup and exit */
- close(pipefd[0]);
-
- /* Control won't reach below */
- exit(0);
+ SAFE_KILL(ret, SIGUSR1);
+ TST_CHECKPOINT_WAKE(0);
}
+
+static struct tst_test test = {
+ .test_all = run,
+ .needs_root = 1,
+ .needs_checkpoints = 1,
+};
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com> --- testcases/kernel/containers/pidns/pidns12.c | 184 +++++--------------- 1 file changed, 43 insertions(+), 141 deletions(-)