[LTP] [PATCH v4] Rewrite userns06.c using new LTP API
Andrea Cervesato
andrea.cervesato@suse.de
Tue Apr 26 10:47:55 CEST 2022
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.de>
---
testcases/kernel/containers/userns/userns06.c | 185 ++++++++----------
.../containers/userns/userns06_capcheck.c | 67 +++----
2 files changed, 114 insertions(+), 138 deletions(-)
diff --git a/testcases/kernel/containers/userns/userns06.c b/testcases/kernel/containers/userns/userns06.c
index 29f635de5..100ad8274 100644
--- a/testcases/kernel/containers/userns/userns06.c
+++ b/testcases/kernel/containers/userns/userns06.c
@@ -1,65 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) Huawei Technologies Co., Ltd., 2015
- * 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.
+ * Copyright (C) 2022 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
*/
-/*
- * Verify that:
- * When a process with non-zero user IDs performs an execve(), the process's
- * capability sets are cleared.
+/*\
+ * [Description]
+ *
+ * Verify that when a process with non-zero user IDs performs an execve(),
+ * the process's capability sets are cleared.
* When a process with zero user IDs performs an execve(), the process's
* capability sets are set.
- *
*/
+#include "tst_test.h"
+#include "config.h"
+
+#ifdef HAVE_LIBCAP
#define _GNU_SOURCE
-#include <sys/wait.h>
-#include <assert.h>
+
#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include "libclone.h"
-#include "test.h"
-#include "config.h"
-#include "userns_helper.h"
+#include "common.h"
+
+#define TEST_APP "userns06_capcheck"
#define CHILD1UID 0
#define CHILD1GID 0
#define CHILD2UID 200
#define CHILD2GID 200
-char *TCID = "user_namespace6";
-int TST_TOTAL = 1;
-
-static int cpid1, parentuid, parentgid;
-
/*
* child_fn1() - Inside a new user namespace
*/
static int child_fn1(void)
{
- int exit_val = 0;
- char *const args[] = { "userns06_capcheck", "privileged", NULL };
+ char *const args[] = { TEST_APP, "privileged", NULL };
+ int ret;
- TST_SAFE_CHECKPOINT_WAIT(NULL, 0);
+ TST_CHECKPOINT_WAIT(0);
- if (execve(args[0], args, NULL) == -1) {
- printf("execvp unexpected error: (%d) %s\n",
- errno, strerror(errno));
- exit_val = 1;
- }
+ /* execv will replace the main function and it will end this child
+ * accordingly.
+ */
+ ret = execv(args[0], args);
+ if (ret == -1)
+ tst_brk(TBROK | TERRNO, "execv: unexpected error");
- return exit_val;
+ return 0;
}
/*
@@ -67,97 +54,95 @@ static int child_fn1(void)
*/
static int child_fn2(void)
{
- int exit_val = 0;
- int uid, gid;
- char *const args[] = { "userns06_capcheck", "unprivileged", NULL };
+ int uid, gid, ret;
+ char *const args[] = { TEST_APP, "unprivileged", NULL };
- TST_SAFE_CHECKPOINT_WAIT(NULL, 1);
+ TST_CHECKPOINT_WAIT(1);
uid = geteuid();
gid = getegid();
if (uid != CHILD2UID || gid != CHILD2GID) {
- printf("unexpected uid=%d gid=%d\n", uid, gid);
- exit_val = 1;
+ tst_res(TFAIL, "unexpected uid=%d gid=%d", uid, gid);
+ return 1;
}
- if (execve(args[0], args, NULL) == -1) {
- printf("execvp unexpected error: (%d) %s\n",
- errno, strerror(errno));
- exit_val = 1;
- }
+ tst_res(TPASS, "expected uid and gid");
- return exit_val;
-}
+ /* execv will replace the main function and it will end this child
+ * accordingly.
+ */
+ ret = execv(args[0], args);
+ if (ret == -1)
+ tst_brk(TBROK | TERRNO, "execv: unexpected error");
-static void cleanup(void)
-{
- tst_rmdir();
+ return 0;
}
static void setup(void)
{
check_newuser();
- tst_tmpdir();
- TST_CHECKPOINT_INIT(NULL);
- TST_RESOURCE_COPY(cleanup, "userns06_capcheck", NULL);
}
-int main(int argc, char *argv[])
+static void run(void)
{
+ pid_t cpid1;
pid_t cpid2;
+ int parentuid;
+ int parentgid;
char path[BUFSIZ];
- int lc;
int fd;
- tst_parse_opts(argc, argv, NULL, NULL);
-#ifndef HAVE_LIBCAP
- tst_brkm(TCONF, NULL, "System is missing libcap.");
-#endif
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- tst_count = 0;
+ parentuid = geteuid();
+ parentgid = getegid();
- parentuid = geteuid();
- parentgid = getegid();
+ cpid1 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, (void *)child_fn1, NULL);
+ if (cpid1 < 0)
+ tst_brk(TBROK | TTERRNO, "cpid1 clone failed");
- cpid1 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD,
- (void *)child_fn1, NULL);
- if (cpid1 < 0)
- tst_brkm(TBROK | TERRNO, cleanup,
- "cpid1 clone failed");
+ cpid2 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, (void *)child_fn2, NULL);
+ if (cpid2 < 0)
+ tst_brk(TBROK | TTERRNO, "cpid2 clone failed");
- cpid2 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD,
- (void *)child_fn2, NULL);
- if (cpid2 < 0)
- tst_brkm(TBROK | TERRNO, cleanup,
- "cpid2 clone failed");
+ if (access("/proc/self/setgroups", F_OK) == 0) {
+ sprintf(path, "/proc/%d/setgroups", cpid1);
- if (access("/proc/self/setgroups", F_OK) == 0) {
- sprintf(path, "/proc/%d/setgroups", cpid1);
- fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
- SAFE_WRITE(cleanup, 1, fd, "deny", 4);
- SAFE_CLOSE(cleanup, fd);
+ fd = SAFE_OPEN(path, O_WRONLY, 0644);
+ SAFE_WRITE(1, fd, "deny", 4);
+ SAFE_CLOSE(fd);
- sprintf(path, "/proc/%d/setgroups", cpid2);
- fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
- SAFE_WRITE(cleanup, 1, fd, "deny", 4);
- SAFE_CLOSE(cleanup, fd);
- }
+ sprintf(path, "/proc/%d/setgroups", cpid2);
- updatemap(cpid1, UID_MAP, CHILD1UID, parentuid, cleanup);
- updatemap(cpid2, UID_MAP, CHILD2UID, parentuid, cleanup);
+ fd = SAFE_OPEN(path, O_WRONLY, 0644);
+ SAFE_WRITE(1, fd, "deny", 4);
+ SAFE_CLOSE(fd);
+ }
- updatemap(cpid1, GID_MAP, CHILD1GID, parentgid, cleanup);
- updatemap(cpid2, GID_MAP, CHILD2GID, parentgid, cleanup);
+ updatemap(cpid1, UID_MAP, CHILD1UID, parentuid);
+ updatemap(cpid2, UID_MAP, CHILD2UID, parentuid);
- TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
- TST_SAFE_CHECKPOINT_WAKE(cleanup, 1);
+ updatemap(cpid1, GID_MAP, CHILD1GID, parentgid);
+ updatemap(cpid2, GID_MAP, CHILD2GID, parentgid);
- tst_record_childstatus(cleanup, cpid1);
- tst_record_childstatus(cleanup, cpid2);
- }
- cleanup();
- tst_exit();
+ TST_CHECKPOINT_WAKE(0);
+ TST_CHECKPOINT_WAKE(1);
}
+
+static struct tst_test test = {
+ .setup = setup,
+ .test_all = run,
+ .needs_root = 1,
+ .needs_checkpoints = 1,
+ .resource_files = (char *const []) {
+ TEST_APP,
+ NULL,
+ },
+ .needs_kconfigs = (const char *[]) {
+ "CONFIG_USER_NS",
+ NULL,
+ },
+};
+
+#else
+TST_TEST_TCONF("System is missing libcap");
+#endif
diff --git a/testcases/kernel/containers/userns/userns06_capcheck.c b/testcases/kernel/containers/userns/userns06_capcheck.c
index 31f7e0a25..589e8bb94 100644
--- a/testcases/kernel/containers/userns/userns06_capcheck.c
+++ b/testcases/kernel/containers/userns/userns06_capcheck.c
@@ -1,74 +1,65 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) Huawei Technologies Co., Ltd., 2015
- * 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.
+ * Copyright (C) 2022 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
*
- * 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.
- */
-
-/*
- * Verify that:
* When a process with non-zero user IDs performs an execve(), the
* process's capability sets are cleared. When a process with zero
* user IDs performs an execve(), the process's capability sets
* are set.
*/
+#define TST_NO_DEFAULT_MAIN
+#include "tst_test.h"
+#include "config.h"
+
+#ifdef HAVE_LIBCAP
#define _GNU_SOURCE
-#include <sys/wait.h>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+
#include <string.h>
-#include <errno.h>
-#include "libclone.h"
-#include "test.h"
-#include "config.h"
-#if HAVE_SYS_CAPABILITY_H
+#include <sys/wait.h>
#include <sys/capability.h>
-#endif
-
-char *TCID = "userns06_capcheck";
-int TST_TOTAL = 1;
int main(int argc, char *argv[])
{
-#ifdef HAVE_LIBCAP
cap_t caps;
int i, last_cap;
cap_flag_value_t flag_val;
cap_flag_value_t expected_flag = 1;
-#endif
- tst_parse_opts(argc, argv, NULL, NULL);
-#ifdef HAVE_LIBCAP
+ tst_reinit();
+
+ if (argc < 2)
+ tst_brk(TBROK, "userns06_capcheck <privileged|unprivileged>");
+
+ SAFE_FILE_SCANF("/proc/sys/kernel/cap_last_cap", "%d", &last_cap);
+
if (strcmp("privileged", argv[1]))
expected_flag = 0;
caps = cap_get_proc();
- SAFE_FILE_SCANF(NULL, "/proc/sys/kernel/cap_last_cap", "%d", &last_cap);
+
for (i = 0; i <= last_cap; i++) {
cap_get_flag(caps, i, CAP_EFFECTIVE, &flag_val);
if (flag_val != expected_flag)
break;
+
cap_get_flag(caps, i, CAP_PERMITTED, &flag_val);
if (flag_val != expected_flag)
break;
}
- if (flag_val != expected_flag) {
- printf("unexpected effective/permitted caps at %d\n", i);
- exit(1);
- }
+ if (flag_val != expected_flag)
+ tst_res(TFAIL, "unexpected effective/permitted caps at %d", i);
+ else
+ tst_res(TPASS, "expected caps at %d", i);
+}
#else
- printf("System is missing libcap.\n");
-#endif
- tst_exit();
+int main(void)
+{
+ tst_reinit();
+
+ tst_brk(TBROK, "System is missing libcap");
}
+#endif
--
2.36.0
More information about the ltp
mailing list