From patchwork Fri Feb 11 09:26:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1591541 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ZtFhWqVm; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=aD7gcfpd; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jw7ZP0nXxz9s5B for ; Fri, 11 Feb 2022 20:27:57 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id EE8B03C9F05 for ; Fri, 11 Feb 2022 10:27:48 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 19C4F3C9E46 for ; Fri, 11 Feb 2022 10:26:53 +0100 (CET) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id A6A42140139C for ; Fri, 11 Feb 2022 10:26:52 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1C5DF21138; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KxP3B8ROVWjYQBCnofBq10EhX3RJ9yq0SEYI20Mf+kA=; b=ZtFhWqVmYBbhWuyunOFovYRKyyvXa1xPN2PbDvPR2NIK/GTNHJLHx3oWk/7rJHGPFKURM2 zsmQ9C9uayaUur8SekYUVkg3E6U5HZr0/8L0jxzV8VFoaq+4Zqdc5m2gFywRuW8PK3Sv3X KP7RKreQiC7MM/uGr/+nxD3kRgX4h6c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KxP3B8ROVWjYQBCnofBq10EhX3RJ9yq0SEYI20Mf+kA=; b=aD7gcfpdyMyRvZdkIKJbnKuk4jSSx6Ci7KuxDg5JSMKoLJC9IRhgL2ZBsWEMfzaUp/4Lme ygPA6utvVO8M1sBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D20F313BC3; Fri, 11 Feb 2022 09:26:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id oEIKMdsrBmJ7EwAAMHmgww (envelope-from ); Fri, 11 Feb 2022 09:26:51 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 11 Feb 2022 10:26:39 +0100 Message-Id: <20220211092646.23748-2-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220211092646.23748-1-andrea.cervesato@suse.de> References: <20220211092646.23748-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH v1 1/8] Rewrite userns01.c test using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Added common.h and removed helper header. Removed libclone dependency. Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/userns/Makefile | 23 +--- testcases/kernel/containers/userns/common.h | 58 +++++++++ testcases/kernel/containers/userns/userns01.c | 111 +++++++++--------- .../kernel/containers/userns/userns_helper.h | 62 ---------- 4 files changed, 116 insertions(+), 138 deletions(-) create mode 100644 testcases/kernel/containers/userns/common.h delete mode 100644 testcases/kernel/containers/userns/userns_helper.h diff --git a/testcases/kernel/containers/userns/Makefile b/testcases/kernel/containers/userns/Makefile index 80681096d..c1f10de20 100644 --- a/testcases/kernel/containers/userns/Makefile +++ b/testcases/kernel/containers/userns/Makefile @@ -1,26 +1,11 @@ -############################################################################### -# ## -# 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. ## -############################################################################### +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) Huawei Technologies Co., Ltd., 2015 +# Copyright (C) 2021 SUSE LLC Andrea Cervesato top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc -LDLIBS := -lclone $(LDLIBS) $(CAP_LIBS) +LDLIBS := $(CAP_LIBS) $(LDLIBS) include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/containers/userns/common.h b/testcases/kernel/containers/userns/common.h new file mode 100644 index 000000000..95160c8cc --- /dev/null +++ b/testcases/kernel/containers/userns/common.h @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) Huawei Technologies Co., Ltd., 2015 + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +#ifndef COMMON_H +#define COMMON_H + +#include "tst_test.h" +#include "lapi/namespaces_constants.h" + +#define UID_MAP 0 +#define GID_MAP 1 + +static int dummy_child(void *v) +{ + (void)v; + return 0; +} + +static inline int check_newuser(void) +{ + int pid, status; + + if (tst_kvercmp(3, 8, 0) < 0) + tst_brk(TCONF, "CLONE_NEWUSER not supported"); + + pid = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, dummy_child, NULL); + if (pid == -1) + tst_brk(TCONF | TTERRNO, "CLONE_NEWUSER not supported"); + + SAFE_WAIT(&status); + + return 0; +} + +static inline void updatemap(int cpid, bool type, int idnum, int parentmappid) +{ + char path[BUFSIZ]; + char content[BUFSIZ]; + int fd; + + if (type == UID_MAP) + sprintf(path, "/proc/%d/uid_map", cpid); + else if (type == GID_MAP) + sprintf(path, "/proc/%d/gid_map", cpid); + else + tst_brk(TBROK, "invalid type parameter"); + + sprintf(content, "%d %d 1", idnum, parentmappid); + + fd = SAFE_OPEN(path, O_WRONLY, 0644); + SAFE_WRITE(1, fd, content, strlen(content)); + SAFE_CLOSE(fd); +} + +#endif diff --git a/testcases/kernel/containers/userns/userns01.c b/testcases/kernel/containers/userns/userns01.c index 1c8cf570d..2287f333a 100644 --- a/testcases/kernel/containers/userns/userns01.c +++ b/testcases/kernel/containers/userns/userns01.c @@ -1,115 +1,112 @@ +// 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. + * Copyright (C) 2022 SUSE LLC Andrea Cervesato */ -/* +/*\ + * [Description] + * * Verify that: - * If a user ID has no mapping inside the namespace, user ID and group - * ID will be the value defined in the file /proc/sys/kernel/overflowuid(65534) - * and /proc/sys/kernel/overflowgid(65534). A child process has a full set - * of permitted and effective capabilities, even though the program was - * run from an unprivileged account. + * If a user ID has no mapping inside the namespace, user ID and group ID will + * be the value defined in the file /proc/sys/kernel/overflowuid(65534) and + * /proc/sys/kernel/overflowgid(65534). A child process has a full set of + * permitted and effective capabilities, even though the program was run from an + * unprivileged account. */ +#include "tst_test.h" + +#ifdef HAVE_LIBCAP #define _GNU_SOURCE -#include -#include + #include -#include -#include -#include -#include -#include "userns_helper.h" -#include "test.h" +#include +#include "common.h" #include "config.h" -#if HAVE_SYS_CAPABILITY_H #include -#endif #define OVERFLOWUIDPATH "/proc/sys/kernel/overflowuid" #define OVERFLOWGIDPATH "/proc/sys/kernel/overflowgid" -char *TCID = "user_namespace1"; -int TST_TOTAL = 1; - static long overflowuid; static long overflowgid; /* * child_fn1() - Inside a new user namespace */ -static int child_fn1(void *arg LTP_ATTRIBUTE_UNUSED) +static int child_fn1(LTP_ATTRIBUTE_UNUSED void *arg) { int exit_val = 0; int uid, gid; -#ifdef HAVE_LIBCAP cap_t caps; int i, last_cap; cap_flag_value_t flag_val; -#endif uid = geteuid(); gid = getegid(); - tst_resm(TINFO, "USERNS test is running in a new user namespace."); + tst_res(TINFO, "USERNS test is running in a new user namespace."); if (uid != overflowuid || gid != overflowgid) { - printf("Got unexpected result of uid=%d gid=%d\n", uid, gid); + tst_res(TFAIL, "got unexpected uid=%d gid=%d", uid, gid); exit_val = 1; + } else { + tst_res(TPASS, "got expected uid and gid"); } -#ifdef HAVE_LIBCAP caps = cap_get_proc(); - SAFE_FILE_SCANF(NULL, "/proc/sys/kernel/cap_last_cap", "%d", &last_cap); + + SAFE_FILE_SCANF("/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 == 0) + if (!flag_val) break; + cap_get_flag(caps, i, CAP_PERMITTED, &flag_val); - if (flag_val == 0) + if (!flag_val) break; } - if (flag_val == 0) { - printf("unexpected effective/permitted caps at %d\n", i); + if (!flag_val) { + tst_res(TFAIL, "unexpected effective/permitted caps at %d", i); exit_val = 1; + } else { + tst_res(TPASS, "expected capabilities"); } -#else - printf("System is missing libcap.\n"); -#endif + return exit_val; } static void setup(void) { check_newuser(); - SAFE_FILE_SCANF(NULL, OVERFLOWUIDPATH, "%ld", &overflowuid); - SAFE_FILE_SCANF(NULL, OVERFLOWGIDPATH, "%ld", &overflowgid); + + SAFE_FILE_SCANF(OVERFLOWUIDPATH, "%ld", &overflowuid); + SAFE_FILE_SCANF(OVERFLOWGIDPATH, "%ld", &overflowgid); } -int main(int argc, char *argv[]) +static void run(void) { - int lc; + int pid; - tst_parse_opts(argc, argv, NULL, NULL); - setup(); + pid = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, child_fn1, NULL); + if (pid < 0) + tst_brk(TBROK | TTERRNO, "clone failed"); +} - for (lc = 0; TEST_LOOPING(lc); lc++) { - TEST(do_clone_unshare_test(T_CLONE, CLONE_NEWUSER, - child_fn1, NULL)); +static struct tst_test test = { + .setup = setup, + .test_all = run, + .needs_root = 1, + .needs_kconfigs = + (const char *[]){ + "CONFIG_USER_NS", + NULL, + }, +}; - if (TEST_RETURN == -1) - tst_brkm(TFAIL | TTERRNO, NULL, "clone failed"); - tst_record_childstatus(NULL, -1); - } - tst_exit(); -} +#else +TST_TEST_TCONF("System is missing libcap"); +#endif diff --git a/testcases/kernel/containers/userns/userns_helper.h b/testcases/kernel/containers/userns/userns_helper.h deleted file mode 100644 index 12b491f62..000000000 --- a/testcases/kernel/containers/userns/userns_helper.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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. - */ - -#include "../libclone/libclone.h" -#include "test.h" -#include "safe_macros.h" -#include - -#define UID_MAP 0 -#define GID_MAP 1 - -static int dummy_child(void *v) -{ - (void) v; - return 0; -} - -static int check_newuser(void) -{ - int pid, status; - - if (tst_kvercmp(3, 8, 0) < 0) - tst_brkm(TCONF, NULL, "CLONE_NEWUSER not supported"); - - pid = do_clone_unshare_test(T_CLONE, CLONE_NEWUSER, dummy_child, NULL); - if (pid == -1) - tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWUSER not supported"); - SAFE_WAIT(NULL, &status); - - return 0; -} - -LTP_ATTRIBUTE_UNUSED static int updatemap(int cpid, bool type, int idnum, - int parentmappid, void (*cleanup)(void)) -{ - char path[BUFSIZ]; - char content[BUFSIZ]; - int fd; - - if (type == UID_MAP) - sprintf(path, "/proc/%d/uid_map", cpid); - else if (type == GID_MAP) - sprintf(path, "/proc/%d/gid_map", cpid); - else - tst_brkm(TBROK, cleanup, "invalid type parameter"); - - sprintf(content, "%d %d 1", idnum, parentmappid); - fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644); - SAFE_WRITE(cleanup, 1, fd, content, strlen(content)); - SAFE_CLOSE(cleanup, fd); - return 0; -} From patchwork Fri Feb 11 09:26:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1591538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Q/ylx7wd; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=SmNbodbP; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jw7Yh510Wz9s5B for ; Fri, 11 Feb 2022 20:27:20 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A80FF3C9F10 for ; Fri, 11 Feb 2022 10:27:18 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [IPv6:2001:4b78:1:20::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id DF8CB3C9E46 for ; Fri, 11 Feb 2022 10:26:53 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id DA2C91A01523 for ; Fri, 11 Feb 2022 10:26:52 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 4CDCC1F385; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9plBEJjoueP6/NnSXRf243lAlfuIkEDHiCvxspBaWhE=; b=Q/ylx7wdWBdrYbOLLNmOjJUI+8Wkt843N7Eu41/mgLJDHrghyNdnfViRYuNtQY9N/jOY7B ueLW8m+fFgjIPT8wrEm+SmbRNcGLGGCH2E0hEGy2N8LmSXd02ScqLozx32DD4QZFqTiYmE 7XwXc07ZIR56hxSq2VaCnMFG+ZT3azM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9plBEJjoueP6/NnSXRf243lAlfuIkEDHiCvxspBaWhE=; b=SmNbodbP740vsCAjijbvnF83/aTlyTYiz+3JXLBvavhsoVrqtD7lvtaZyb7Rya6EaUo/mP 2EU01JqY87wnWWDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 1F81313BCF; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eBZYBdwrBmJ7EwAAMHmgww (envelope-from ); Fri, 11 Feb 2022 09:26:52 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 11 Feb 2022 10:26:40 +0100 Message-Id: <20220211092646.23748-3-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220211092646.23748-1-andrea.cervesato@suse.de> References: <20220211092646.23748-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-3.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-3.smtp.seeweb.it Subject: [LTP] [PATCH v1 2/8] Rewrite userns02.c test using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/userns/userns02.c | 132 ++++++++---------- 1 file changed, 58 insertions(+), 74 deletions(-) diff --git a/testcases/kernel/containers/userns/userns02.c b/testcases/kernel/containers/userns/userns02.c index ae49a1599..e3b2d34eb 100644 --- a/testcases/kernel/containers/userns/userns02.c +++ b/testcases/kernel/containers/userns/userns02.c @@ -1,58 +1,41 @@ +// 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. + * Copyright (C) 2022 SUSE LLC Andrea Cervesato */ -/* +/*\ + * [Description] + * * Verify that: - * The user ID and group ID, which are inside a container, can be modified - * by its parent process. + * The user ID and group ID, which are inside a container, can be modified by + * its parent process. */ #define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include "userns_helper.h" -#include "test.h" - -char *TCID = "user_namespace2"; -int TST_TOTAL = 1; -static void cleanup(void) -{ - tst_rmdir(); -} +#include +#include +#include "common.h" +#include "tst_test.h" /* * child_fn1() - Inside a new user namespace */ static int child_fn1(void) { - int exit_val; + int exit_val = 0; int uid, gid; - TST_SAFE_CHECKPOINT_WAIT(NULL, 0); + TST_CHECKPOINT_WAIT(0); + uid = geteuid(); gid = getegid(); if (uid == 100 && gid == 100) { - printf("Got expected uid and gid.\n"); - exit_val = 0; + tst_res(TPASS, "got expected uid and gid"); } else { - printf("Got unexpected result of uid=%d gid=%d\n", uid, gid); + tst_res(TFAIL, "got unexpected uid=%d gid=%d", uid, gid); exit_val = 1; } @@ -62,13 +45,10 @@ static int child_fn1(void) static void setup(void) { check_newuser(); - tst_tmpdir(); - TST_CHECKPOINT_INIT(NULL); } -int main(int argc, char *argv[]) +static void run(void) { - int lc; int childpid; int parentuid; int parentgid; @@ -76,42 +56,46 @@ int main(int argc, char *argv[]) char content[BUFSIZ]; int fd; - tst_parse_opts(argc, argv, NULL, NULL); - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - childpid = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, - (void *)child_fn1, NULL); - - if (childpid < 0) - tst_brkm(TFAIL | TERRNO, cleanup, "clone failed"); - - parentuid = geteuid(); - parentgid = getegid(); - sprintf(path, "/proc/%d/uid_map", childpid); - sprintf(content, "100 %d 1", parentuid); - fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644); - SAFE_WRITE(cleanup, 1, fd, content, strlen(content)); - SAFE_CLOSE(cleanup, fd); - - if (access("/proc/self/setgroups", F_OK) == 0) { - sprintf(path, "/proc/%d/setgroups", childpid); - fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644); - SAFE_WRITE(cleanup, 1, fd, "deny", 4); - SAFE_CLOSE(cleanup, fd); - } - - sprintf(path, "/proc/%d/gid_map", childpid); - sprintf(content, "100 %d 1", parentgid); - fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644); - SAFE_WRITE(cleanup, 1, fd, content, strlen(content)); - SAFE_CLOSE(cleanup, fd); - - TST_SAFE_CHECKPOINT_WAKE(cleanup, 0); - - tst_record_childstatus(cleanup, childpid); + childpid = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, (void *)child_fn1, NULL); + if (childpid < 0) + tst_brk(TBROK | TTERRNO, "clone failed"); + + parentuid = geteuid(); + parentgid = getegid(); + + sprintf(path, "/proc/%d/uid_map", childpid); + sprintf(content, "100 %d 1", parentuid); + + fd = SAFE_OPEN(path, O_WRONLY, 0644); + SAFE_WRITE(1, fd, content, strlen(content)); + SAFE_CLOSE(fd); + + if (access("/proc/self/setgroups", F_OK) == 0) { + sprintf(path, "/proc/%d/setgroups", childpid); + + fd = SAFE_OPEN(path, O_WRONLY, 0644); + SAFE_WRITE(1, fd, "deny", 4); + SAFE_CLOSE(fd); } - cleanup(); - tst_exit(); + + sprintf(path, "/proc/%d/gid_map", childpid); + sprintf(content, "100 %d 1", parentgid); + + fd = SAFE_OPEN(path, O_WRONLY, 0644); + SAFE_WRITE(1, fd, content, strlen(content)); + SAFE_CLOSE(fd); + + TST_CHECKPOINT_WAKE(0); } + +static struct tst_test test = { + .setup = setup, + .test_all = run, + .needs_root = 1, + .needs_checkpoints = 1, + .needs_kconfigs = + (const char *[]){ + "CONFIG_USER_NS", + NULL, + }, +}; From patchwork Fri Feb 11 09:26:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1591537 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=eqALTIzU; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=wXk101yf; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jw7YT5m5Rz9s5B for ; Fri, 11 Feb 2022 20:27:09 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 3B9B63C9E46 for ; Fri, 11 Feb 2022 10:27:07 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id A1F453C9888 for ; Fri, 11 Feb 2022 10:26:53 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id DB22C1001372 for ; Fri, 11 Feb 2022 10:26:52 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 8747E1F38B; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ShgsQW6pZttJ55TaRku8BCS7iu372t9C+rUj9gwRaMY=; b=eqALTIzUQPVl2j+dE4gajBZVUcWnmiI1/dihBpf8zmvXQL2tFMKmiaN1WHL0Sdj3V9gp5X yeAZKPbfECyY0SIh7WhAZBsDfjdjJGMfRN3cU7dqnNHITniea6guYE0VvYN6pPkw3bae/c lqHgEhmvUEYrEA0UhgfXsL7adyKia9c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ShgsQW6pZttJ55TaRku8BCS7iu372t9C+rUj9gwRaMY=; b=wXk101yf2Qa4Nl7hzgT8zwKfvKb5xrES3CfbpgkzK/jtgdiJj4O67x9szNd7o0pKnro3kN L1imUb/Aio/KpUCQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5BB1213BC3; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KCvaE9wrBmJ7EwAAMHmgww (envelope-from ); Fri, 11 Feb 2022 09:26:52 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 11 Feb 2022 10:26:41 +0100 Message-Id: <20220211092646.23748-4-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220211092646.23748-1-andrea.cervesato@suse.de> References: <20220211092646.23748-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH v1 3/8] Rewrite userns03.c test using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/userns/userns03.c | 235 +++++++++--------- 1 file changed, 113 insertions(+), 122 deletions(-) diff --git a/testcases/kernel/containers/userns/userns03.c b/testcases/kernel/containers/userns/userns03.c index be511fec8..bc23efb4c 100644 --- a/testcases/kernel/containers/userns/userns03.c +++ b/testcases/kernel/containers/userns/userns03.c @@ -1,16 +1,12 @@ +// 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 */ -/* +/*\ + * [Description] + * * Verify that: * /proc/PID/uid_map and /proc/PID/gid_map contains three values separated by * white space: @@ -34,21 +30,17 @@ * commit 66d2f338ee4c449396b6f99f5e75cd18eb6df272 * Author: Eric W. Biederman * Date: Fri Dec 5 19:36:04 2014 -0600 - * userns: Allow setting gid_maps without privilege when setgroups is disabled + * userns: Allow setting gid_maps without privilege when setgroups is + * disabled * */ #define _GNU_SOURCE -#include -#include + #include -#include #include -#include -#include -#include -#include "userns_helper.h" -#include "test.h" +#include "common.h" +#include "tst_test.h" #define CHILD1UID 0 #define CHILD1GID 0 @@ -57,16 +49,16 @@ #define UID_MAP 0 #define GID_MAP 1 -char *TCID = "user_namespace3"; -int TST_TOTAL = 1; -static int cpid1, parentuid, parentgid; +static int cpid1; +static int parentuid; +static int parentgid; /* * child_fn1() - Inside a new user namespace */ static int child_fn1(void) { - TST_SAFE_CHECKPOINT_WAIT(NULL, 0); + TST_CHECKPOINT_WAIT(0); return 0; } @@ -81,155 +73,154 @@ static int child_fn2(void) char cpid1gidpath[BUFSIZ]; int idinsidens, idoutsidens, length; - 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); + tst_res(TFAIL, "unexpected uid=%d gid=%d\n", uid, gid); exit_val = 1; + } else { + tst_res(TPASS, "expected uid and gid"); } - /*Get the uid parameters of the child_fn2 process.*/ - SAFE_FILE_SCANF(NULL, "/proc/self/uid_map", "%d %d %d", &idinsidens, - &idoutsidens, &length); + /* Get the uid parameters of the child_fn2 process */ + SAFE_FILE_SCANF("/proc/self/uid_map", "%d %d %d", &idinsidens, &idoutsidens, &length); /* map file format:ID-inside-ns ID-outside-ns length - If the process opening the file is in the same user namespace as - the process PID, then ID-outside-ns is defined with respect to the - parent user namespace.*/ + * If the process opening the file is in the same user namespace as + * the process PID, then ID-outside-ns is defined with respect to the + * parent user namespace + */ if (idinsidens != CHILD2UID || idoutsidens != parentuid) { - printf("child_fn2 checks /proc/cpid2/uid_map:\n"); - printf("unexpected: idinsidens=%d idoutsidens=%d\n", + tst_res(TINFO, "child2 checks /proc/cpid2/uid_map"); + tst_res(TFAIL, "unexpected: namespace ID inside=%d outside=%d", idinsidens, idoutsidens); exit_val = 1; + } else { + tst_res(TPASS, "expected namespaces IDs"); } sprintf(cpid1uidpath, "/proc/%d/uid_map", cpid1); - SAFE_FILE_SCANF(NULL, cpid1uidpath, "%d %d %d", &idinsidens, - &idoutsidens, &length); + SAFE_FILE_SCANF(cpid1uidpath, "%d %d %d", &idinsidens, &idoutsidens, &length); /* If the process opening the file is in a different user namespace, - then ID-outside-ns is defined with respect to the user namespace - of the process opening the file.*/ + * then ID-outside-ns is defined with respect to the user namespace + * of the process opening the file + */ if (idinsidens != CHILD1UID || idoutsidens != CHILD2UID) { - printf("child_fn2 checks /proc/cpid1/uid_map:\n"); - printf("unexpected: idinsidens=%d idoutsidens=%d\n", + tst_res(TINFO, "child2 checks /proc/cpid1/uid_map"); + tst_res(TFAIL, "unexpected: namespace ID inside=%d outside=%d", idinsidens, idoutsidens); exit_val = 1; + } else { + tst_res(TPASS, "expected namespaces IDs"); } sprintf(cpid1gidpath, "/proc/%d/gid_map", cpid1); - SAFE_FILE_SCANF(NULL, "/proc/self/gid_map", "%d %d %d", - &idinsidens, &idoutsidens, &length); + SAFE_FILE_SCANF("/proc/self/gid_map", "%d %d %d", &idinsidens, &idoutsidens, &length); if (idinsidens != CHILD2GID || idoutsidens != parentgid) { - printf("child_fn2 checks /proc/cpid2/gid_map:\n"); - printf("unexpected: idinsidens=%d idoutsidens=%d\n", + tst_res(TINFO, "child2 checks /proc/cpid2/gid_map"); + tst_res(TFAIL, "unexpected: namespace ID inside=%d outside=%d", idinsidens, idoutsidens); exit_val = 1; + } else { + tst_res(TPASS, "expected namespaces IDs"); } - SAFE_FILE_SCANF(NULL, cpid1gidpath, "%d %d %d", &idinsidens, - &idoutsidens, &length); + SAFE_FILE_SCANF(cpid1gidpath, "%d %d %d", &idinsidens, &idoutsidens, &length); if (idinsidens != CHILD1GID || idoutsidens != CHILD2GID) { - printf("child_fn1 checks /proc/cpid1/gid_map:\n"); - printf("unexpected: idinsidens=%d idoutsidens=%d\n", + tst_res(TINFO, "child1 checks /proc/cpid1/gid_map"); + tst_res(TFAIL, "unexpected: namespace ID inside=%d outside=%d", idinsidens, idoutsidens); exit_val = 1; + } else { + tst_res(TPASS, "expected namespaces IDs"); } - TST_SAFE_CHECKPOINT_WAKE(NULL, 0); - TST_SAFE_CHECKPOINT_WAKE(NULL, 1); - return exit_val; -} + TST_CHECKPOINT_WAKE(0); + TST_CHECKPOINT_WAKE(1); -static void cleanup(void) -{ - tst_rmdir(); + return exit_val; } static void setup(void) { check_newuser(); - tst_tmpdir(); - TST_CHECKPOINT_INIT(NULL); } -int main(int argc, char *argv[]) +static void run(void) { pid_t cpid2; char path[BUFSIZ]; - int lc; int fd; int ret; - tst_parse_opts(argc, argv, NULL, NULL); - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - - parentuid = geteuid(); - parentgid = getegid(); - - 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_brkm(TBROK | TERRNO, cleanup, - "cpid2 clone failed"); - - 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); - /* If the setgroups file has the value "deny", - * then the setgroups(2) system call can't - * subsequently be reenabled (by writing "allow" to - * the file) in this user namespace. (Attempts to - * do so will fail with the error EPERM.) - */ - - /* test that setgroups can't be re-enabled */ - fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644); - ret = write(fd, "allow", 5); - - if (ret != -1) { - tst_brkm(TBROK | TERRNO, cleanup, - "write action should fail"); - } else if (errno != EPERM) { - tst_brkm(TBROK | TERRNO, cleanup, - "unexpected error: \n"); - } - SAFE_CLOSE(cleanup, fd); - tst_resm(TPASS, "setgroups can't be re-enabled"); - - 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); - } - - updatemap(cpid1, UID_MAP, CHILD1UID, parentuid, cleanup); - updatemap(cpid2, UID_MAP, CHILD2UID, parentuid, cleanup); - - updatemap(cpid1, GID_MAP, CHILD1GID, parentgid, cleanup); - updatemap(cpid2, GID_MAP, CHILD2GID, parentgid, cleanup); - - TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(cleanup, 1); - - tst_record_childstatus(cleanup, cpid1); - tst_record_childstatus(cleanup, cpid2); + 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"); + + cpid2 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, (void *)child_fn2, NULL); + if (cpid2 < 0) + tst_brk(TBROK | TTERRNO, "cpid2 clone failed"); + + if (access("/proc/self/setgroups", F_OK) == 0) { + sprintf(path, "/proc/%d/setgroups", cpid1); + + fd = SAFE_OPEN(path, O_WRONLY, 0644); + SAFE_WRITE(1, fd, "deny", 4); + SAFE_CLOSE(fd); + + /* If the setgroups file has the value "deny", + * then the setgroups(2) system call can't + * subsequently be reenabled (by writing "allow" to + * the file) in this user namespace. (Attempts to + * do so will fail with the error EPERM.) + */ + + /* test that setgroups can't be re-enabled */ + fd = SAFE_OPEN(path, O_WRONLY, 0644); + ret = write(fd, "allow", 5); + + if (ret >= 0) + tst_brk(TBROK, "write action should fail"); + else if (errno != EPERM) + tst_brk(TBROK | TTERRNO, "unexpected error"); + + SAFE_CLOSE(fd); + + tst_res(TPASS, "setgroups can't be re-enabled"); + + sprintf(path, "/proc/%d/setgroups", cpid2); + + fd = SAFE_OPEN(path, O_WRONLY, 0644); + SAFE_WRITE(1, fd, "deny", 4); + SAFE_CLOSE(fd); } - cleanup(); - tst_exit(); + + updatemap(cpid1, UID_MAP, CHILD1UID, parentuid); + updatemap(cpid2, UID_MAP, CHILD2UID, parentuid); + + updatemap(cpid1, GID_MAP, CHILD1GID, parentgid); + updatemap(cpid2, GID_MAP, CHILD2GID, parentgid); + + TST_CHECKPOINT_WAKE_AND_WAIT(1); } + +static struct tst_test test = { + .setup = setup, + .test_all = run, + .needs_root = 1, + .needs_checkpoints = 1, + .needs_kconfigs = + (const char *[]){ + "CONFIG_USER_NS", + NULL, + }, +}; From patchwork Fri Feb 11 09:26:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1591539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1iba6N4u; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=3ItQl/tU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jw7Yt3kQzz9s5B for ; Fri, 11 Feb 2022 20:27:30 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 6ED9E3C9F0E for ; Fri, 11 Feb 2022 10:27:28 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id DF59B3C9888 for ; Fri, 11 Feb 2022 10:26:53 +0100 (CET) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 25489100135A for ; Fri, 11 Feb 2022 10:26:53 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B7AAB2113A; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WFqhIQLFeXIO1CJfwOsF4FXtW9xlSGcbYiMEhKsgthw=; b=1iba6N4uEOqbtMXW8UXPwsr8uQ2SPiMyz0ZkOsoiINzK6l5iQ+XvUkadq1Igp88ksU2fik 1beodLD4W+gdSkbLwq4aGstA/m83uVgCQdyIzLlxr10FSoEjp923Zzy7hkN1Yi1O63cqIE g1Ly7vagMrH3NGAXbNs7DMyph5MoXk8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WFqhIQLFeXIO1CJfwOsF4FXtW9xlSGcbYiMEhKsgthw=; b=3ItQl/tUguPOoHNAXHRhS1ZmzV6v+rTIvJNlVYQUe+yGT7/qGWu91/tA0CIrOdDfKPtJEI tjn4CgVJzPXciODw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 91AB913BC3; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id IDKMIdwrBmJ7EwAAMHmgww (envelope-from ); Fri, 11 Feb 2022 09:26:52 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 11 Feb 2022 10:26:42 +0100 Message-Id: <20220211092646.23748-5-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220211092646.23748-1-andrea.cervesato@suse.de> References: <20220211092646.23748-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH v1 4/8] Rewrite userns04.c using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/userns/userns04.c | 129 +++++++----------- 1 file changed, 47 insertions(+), 82 deletions(-) diff --git a/testcases/kernel/containers/userns/userns04.c b/testcases/kernel/containers/userns/userns04.c index 66d3388a9..f84521475 100644 --- a/testcases/kernel/containers/userns/userns04.c +++ b/testcases/kernel/containers/userns/userns04.c @@ -1,17 +1,12 @@ +// 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. + * Copyright (C) 2022 SUSE LLC Andrea Cervesato */ -/* +/*\ + * [Description] + * * Verify that: * If a namespace isn't another namespace's ancestor, the process in * first namespace does not have the CAP_SYS_ADMIN capability in the @@ -19,113 +14,83 @@ */ #define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include "userns_helper.h" -#include "test.h" -char *TCID = "user_namespace4"; -int TST_TOTAL = 1; +#include +#include +#include "common.h" +#include "tst_test.h" +#include "lapi/syscalls.h" static void setup(void) { check_newuser(); tst_syscall(__NR_setns, -1, 0); - tst_tmpdir(); - TST_CHECKPOINT_INIT(NULL); } -static void cleanup(void) +static int child_fn1(LTP_ATTRIBUTE_UNUSED void *arg) { - tst_rmdir(); -} - -static int child_fn1(void *arg LTP_ATTRIBUTE_UNUSED) -{ - TST_SAFE_CHECKPOINT_WAIT(NULL, 0); + TST_CHECKPOINT_WAIT(0); return 0; } static int child_fn2(void *arg) { int exit_val = 0; - int ret; - ret = tst_syscall(__NR_setns, ((long)arg), CLONE_NEWUSER); - if (ret != -1) { - printf("child2 setns() unexpected success\n"); - exit_val = 1; - } else if (errno != EPERM) { - printf("child2 setns() unexpected error: (%d) %s\n", - errno, strerror(errno)); + TEST(tst_syscall(__NR_setns, ((long)arg), CLONE_NEWUSER)); + if (TST_RET != -1 || TST_ERR != EPERM) { + tst_res(TFAIL, "child2 setns() unexpected error: (%d) %s", + TST_ERR, tst_strerrno(TST_ERR)); exit_val = 1; + } else { + tst_res(TPASS, "child2 setns() failed as expected"); } - TST_SAFE_CHECKPOINT_WAIT(NULL, 1); + TST_CHECKPOINT_WAIT(1); + return exit_val; } -static void test_cap_sys_admin(void) +static void run(void) { pid_t cpid1, cpid2, cpid3; char path[BUFSIZ]; int fd; - /* child 1 */ - cpid1 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, - (void *)child_fn1, NULL); + cpid1 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, (void *)child_fn1, NULL); if (cpid1 < 0) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); + tst_brk(TBROK | TTERRNO, "clone failed"); - /* child 2 */ sprintf(path, "/proc/%d/ns/user", cpid1); - fd = SAFE_OPEN(cleanup, path, O_RDONLY, 0644); - cpid2 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, - (void *)child_fn2, (void *)((long)fd)); + + fd = SAFE_OPEN(path, O_RDONLY, 0644); + cpid2 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, (void *)child_fn2, + (void *)((long)fd)); if (cpid2 < 0) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); + tst_brk(TBROK | TTERRNO, "clone failed"); /* child 3 - throw-away process changing ns to child1 */ - switch (cpid3 = fork()) { - case -1: - tst_brkm(TBROK | TERRNO, cleanup, "fork"); - case 0: - if (tst_syscall(__NR_setns, fd, CLONE_NEWUSER) == -1) { - printf("parent pid setns failure: (%d) %s", - errno, strerror(errno)); - exit(1); - } - exit(0); + cpid3 = SAFE_FORK(); + if (!cpid3) { + TST_EXP_PASS(tst_syscall(__NR_setns, fd, CLONE_NEWUSER)); + return; } - TST_SAFE_CHECKPOINT_WAKE(cleanup, 0); - TST_SAFE_CHECKPOINT_WAKE(cleanup, 1); - - tst_record_childstatus(cleanup, cpid1); - tst_record_childstatus(cleanup, cpid2); - tst_record_childstatus(cleanup, cpid3); - - SAFE_CLOSE(cleanup, fd); + TST_CHECKPOINT_WAKE(0); + TST_CHECKPOINT_WAKE(1); + SAFE_CLOSE(fd); } -int main(int argc, char *argv[]) -{ - int lc; - - setup(); - tst_parse_opts(argc, argv, NULL, NULL); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - test_cap_sys_admin(); - } - - cleanup(); - tst_exit(); -} +static struct tst_test test = { + .setup = setup, + .test_all = run, + .needs_root = 1, + .forks_child = 1, + .needs_checkpoints = 1, + .needs_kconfigs = + (const char *[]){ + "CONFIG_USER_NS", + NULL, + }, +}; From patchwork Fri Feb 11 09:26:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1591540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Yd67cSo6; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ATwPoZ07; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jw7Z348Dfz9s5B for ; Fri, 11 Feb 2022 20:27:39 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 792993C9F09 for ; Fri, 11 Feb 2022 10:27:37 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 194153C9888 for ; Fri, 11 Feb 2022 10:26:53 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id 44AD160043D for ; Fri, 11 Feb 2022 10:26:53 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E87691F3A8; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8ehqqff4d8Y1f+NT9PH/KWA15/QfHzxxyVs/DsNzSds=; b=Yd67cSo6ajAh/f11iL2qYvKzeHDXBYsk97WKLTE6uc2Hc22BfNwf6XSYUVNZ06r6b7E8Cs G0MiK7ZbyYM43yCHwZ6c8UQzDh2OyIJRdFaD4kto77Ul3kQ+n+5n+LbRvbX/dm9x8Ud8yt gp3VQMkj35l4qOPd2rgverDWjZ9W7MA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1644571612; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8ehqqff4d8Y1f+NT9PH/KWA15/QfHzxxyVs/DsNzSds=; b=ATwPoZ07XHxAiFSUd3bRWPSewiOBfnGEvIyPI9tyc7G92ODS8DZ4sUx4RdGB9DXeOmbO59 SFdkINN9P9Zau1Cw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C1DE113BC3; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qJB2LdwrBmJ7EwAAMHmgww (envelope-from ); Fri, 11 Feb 2022 09:26:52 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 11 Feb 2022 10:26:43 +0100 Message-Id: <20220211092646.23748-6-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220211092646.23748-1-andrea.cervesato@suse.de> References: <20220211092646.23748-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v1 5/8] Rewrite userns05.c test using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/userns/userns05.c | 148 ++++++++---------- 1 file changed, 63 insertions(+), 85 deletions(-) diff --git a/testcases/kernel/containers/userns/userns05.c b/testcases/kernel/containers/userns/userns05.c index be77cb7e9..ae5e00240 100644 --- a/testcases/kernel/containers/userns/userns05.c +++ b/testcases/kernel/containers/userns/userns05.c @@ -1,51 +1,32 @@ +// 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. + * Copyright (C) 2022 SUSE LLC Andrea Cervesato */ -/* +/*\ + * [Description] + * * Verify that: - * A process created via fork(2) or clone(2) without the - * CLONE_NEWUSER flag is a member of the same user namespace as its - * parent. - * When unshare an user namespace, the calling process is moved into - * a new user namespace which is not shared with any previously - * existing process. + * A process created via fork(2) or clone(2) without the CLONE_NEWUSER flag is + * a member of the same user namespace as its parent. + * When unshare an user namespace, the calling process is moved into a new user + * namespace which is not shared with any previously existing process. */ #define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include "userns_helper.h" -#include "test.h" - -char *TCID = "user_namespace5"; -int TST_TOTAL = 1; -static void cleanup(void) -{ - tst_rmdir(); -} +#include +#include +#include "tst_test.h" +#include "common.h" /* * child_fn1() - Inside a new user namespace */ static int child_fn1(void) { - TST_SAFE_CHECKPOINT_WAIT(NULL, 0); + TST_CHECKPOINT_WAIT(0); return 0; } @@ -57,86 +38,83 @@ static unsigned int getusernsidbypid(int pid) sprintf(path, "/proc/%d/ns/user", pid); - if (readlink(path, userid, BUFSIZ) == -1) - tst_resm(TFAIL | TERRNO, "readlink failure."); + SAFE_READLINK(path, userid, BUFSIZ); + + if (sscanf(userid, "user:[%u]", &id) < 0) + tst_brk(TBROK | TERRNO, "sscanf failure"); - if (sscanf(userid, "user:[%u]", &id) != 1) - tst_resm(TFAIL, "sscanf failure."); return id; } -static void test_userns_id(void) +static void run(void) { int cpid1, cpid2, cpid3; unsigned int parentuserns, cpid1userns, cpid2userns, newparentuserns; parentuserns = getusernsidbypid(getpid()); - cpid1 = ltp_clone_quick(SIGCHLD, (void *)child_fn1, - NULL); + + cpid1 = ltp_clone_quick(SIGCHLD, (void *)child_fn1, NULL); if (cpid1 < 0) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); + tst_brk(TBROK | TTERRNO, "clone failed"); + cpid1userns = getusernsidbypid(cpid1); - TST_SAFE_CHECKPOINT_WAKE(cleanup, 0); + + TST_CHECKPOINT_WAKE(0); /* A process created via fork(2) or clone(2) without the - CLONE_NEWUSER flag is a member of the same user namespace as its - parent.*/ + * CLONE_NEWUSER flag is a member of the same user namespace as its + * parent + */ if (parentuserns != cpid1userns) - tst_resm(TFAIL, "userns:parent should be equal to cpid1"); + tst_res(TFAIL, "userns:parent should be equal to cpid1"); + else + tst_res(TPASS, "userns:parent is equal to cpid1"); - cpid2 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, - (void *)child_fn1, NULL); + cpid2 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, (void *)child_fn1, NULL); if (cpid2 < 0) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); + tst_brk(TBROK | TTERRNO, "clone failed"); + cpid2userns = getusernsidbypid(cpid2); - TST_SAFE_CHECKPOINT_WAKE(cleanup, 0); + + TST_CHECKPOINT_WAKE(0); if (parentuserns == cpid2userns) - tst_resm(TFAIL, "userns:parent should be not equal to cpid2"); - - switch (cpid3 = fork()) { - case -1: - tst_brkm(TBROK | TERRNO, cleanup, "fork"); - case 0: - if (unshare(CLONE_NEWUSER) == -1) { - printf("parent pid unshare failure: (%d) %s", - errno, strerror(errno)); - exit(1); - } + tst_res(TFAIL, "userns:parent should be not equal to cpid2"); + else + tst_res(TPASS, "userns:parent is not equal to cpid2"); + + cpid3 = SAFE_FORK(); + if (!cpid3) { + SAFE_UNSHARE(CLONE_NEWUSER); newparentuserns = getusernsidbypid(getpid()); /* When unshare an user namespace, the calling process - is moved into a new user namespace which is not shared - with any previously existing process.*/ + * is moved into a new user namespace which is not shared + * with any previously existing process + */ if (parentuserns == newparentuserns) - exit(1); - exit(0); - } + tst_res(TFAIL, "unshared namespaces with same id"); + else + tst_res(TPASS, "unshared namespaces with different id"); - tst_record_childstatus(cleanup, cpid1); - tst_record_childstatus(cleanup, cpid2); - tst_record_childstatus(cleanup, cpid3); + return; + } } static void setup(void) { check_newuser(); - - tst_tmpdir(); - TST_CHECKPOINT_INIT(NULL); } -int main(int argc, char *argv[]) -{ - int lc; - - tst_parse_opts(argc, argv, NULL, NULL); - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - test_userns_id(); - } - cleanup(); - tst_exit(); -} +static struct tst_test test = { + .setup = setup, + .test_all = run, + .needs_root = 1, + .forks_child = 1, + .needs_checkpoints = 1, + .needs_kconfigs = + (const char *[]){ + "CONFIG_USER_NS", + NULL, + }, +}; From patchwork Fri Feb 11 09:26:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1591542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=iziIOMEp; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=25w2CJ3O; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jw7ZT3cPyz9s5B for ; Fri, 11 Feb 2022 20:28:01 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 3C8723C9F0B for ; Fri, 11 Feb 2022 10:27:59 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 445FE3C9EEB for ; Fri, 11 Feb 2022 10:26:54 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 88EC3601098 for ; Fri, 11 Feb 2022 10:26:53 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 35F3D1F3AA; Fri, 11 Feb 2022 09:26:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1644571613; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rYj5uqupm2ON+ZyMwmVWTEh2LHrz1YbP9bXfeu5EnOo=; b=iziIOMEpHBdrl3dnpcf091n5xpfmEk1wTQnozdvBjIeasCiEO7h9Bok5EgE/oxNCoguTB9 AO1c7uLh4IIAGf713e6vQ8TGa0y4ePw2JbOQj5r3toI4q+7FEim2Ma32vTdYE5KMkKz8sH 4sL1wIGQucLmfBfnXdlsD5kn4Gxz0rs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1644571613; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rYj5uqupm2ON+ZyMwmVWTEh2LHrz1YbP9bXfeu5EnOo=; b=25w2CJ3OyzZJwyVO3wFatzXAfzlbKTVT7hi53fYuqDRkziqytcgWZH75itPH30vGa7e/cl 86BE8KEyeNAvnJBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0030B13BC3; Fri, 11 Feb 2022 09:26:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 2IirOdwrBmJ7EwAAMHmgww (envelope-from ); Fri, 11 Feb 2022 09:26:52 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 11 Feb 2022 10:26:44 +0100 Message-Id: <20220211092646.23748-7-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220211092646.23748-1-andrea.cervesato@suse.de> References: <20220211092646.23748-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v1 6/8] Rewrite userns06.c test using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/userns/userns06.c | 175 ++++++++---------- .../containers/userns/userns06_capcheck.c | 75 +++++--- 2 files changed, 125 insertions(+), 125 deletions(-) diff --git a/testcases/kernel/containers/userns/userns06.c b/testcases/kernel/containers/userns/userns06.c index 29f635de5..b88718333 100644 --- a/testcases/kernel/containers/userns/userns06.c +++ b/testcases/kernel/containers/userns/userns06.c @@ -1,65 +1,51 @@ +// 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 */ -/* +/*\ + * [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 -#include + #include -#include #include -#include -#include -#include -#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 }; - 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. + */ + execv(args[0], args); - return exit_val; + return 0; } /* @@ -67,97 +53,96 @@ static int child_fn1(void) */ static int child_fn2(void) { - int exit_val = 0; int uid, gid; - char *const args[] = { "userns06_capcheck", "unprivileged", NULL }; + 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. + */ + execv(args[0], args); -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 const char *const resource_files[] = { + TEST_APP, + NULL, +}; + +static struct tst_test test = { + .setup = setup, + .test_all = run, + .needs_root = 1, + .needs_checkpoints = 1, + .resource_files = resource_files, + .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..d8e670fb1 100644 --- a/testcases/kernel/containers/userns/userns06_capcheck.c +++ b/testcases/kernel/containers/userns/userns06_capcheck.c @@ -1,62 +1,66 @@ +// 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. + * Copyright (C) 2022 SUSE LLC Andrea Cervesato */ -/* - * Verify that: +/*\ + * [Description] + * * 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 _GNU_SOURCE -#include -#include +#include "config.h" #include #include + +#ifdef HAVE_LIBCAP +#define _GNU_SOURCE + +#include #include #include #include -#include "libclone.h" -#include "test.h" -#include "config.h" -#if HAVE_SYS_CAPABILITY_H +#include #include -#endif - -char *TCID = "userns06_capcheck"; -int TST_TOTAL = 1; int main(int argc, char *argv[]) { -#ifdef HAVE_LIBCAP + FILE *f = NULL; 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 + if (argc < 2) { + printf("userns06_capcheck \n"); + goto error; + } + + f = fopen("/proc/sys/kernel/cap_last_cap", "r"); + if (f == NULL) { + printf("fopen error: %s\n", strerror(errno)); + goto error; + } + + if (!fscanf(f, "%d", &last_cap)) { + printf("fscanf error: %s\n", strerror(errno)); + goto error; + } + 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; @@ -64,11 +68,22 @@ int main(int argc, char *argv[]) if (flag_val != expected_flag) { printf("unexpected effective/permitted caps at %d\n", i); - exit(1); + goto error; } + exit(0); + +error: + if (f) + fclose(f); + + exit(1); +} + #else +int main(void) +{ printf("System is missing libcap.\n"); -#endif - tst_exit(); + exit(1); } +#endif From patchwork Fri Feb 11 09:26:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1591543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=VRGaD2pL; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YZDcxv23; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jw7Zj2ffZz9s5B for ; Fri, 11 Feb 2022 20:28:13 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A24B43C9888 for ; Fri, 11 Feb 2022 10:28:10 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 3E8FA3C9EEA for ; Fri, 11 Feb 2022 10:26:54 +0100 (CET) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id B55C2100137D for ; Fri, 11 Feb 2022 10:26:53 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 593812112A; Fri, 11 Feb 2022 09:26:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1644571613; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KxsaoypdrfC60P+BuOWrglcqSaB0IyEQ/xdu9c/NpgE=; b=VRGaD2pLFwnvpWXkf4XneVEVbAOHnAOoWoe3C0qa45gb+kN6w0N6VuvyQqsrwe0xqxoTAQ ErOjZAJCPCKhaZ1jSp9wzqnLSLrn3ebxzExmTRm5xQPrsmjy+kpXREircDrImmBm8LbN36 +jftpE+shjuPnbxoQpZ/bOPBSykNHGE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1644571613; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KxsaoypdrfC60P+BuOWrglcqSaB0IyEQ/xdu9c/NpgE=; b=YZDcxv23v3hjawOKh12xZYiiVVr0jyXzSJ6+Tl1DBl7E+SIjzbBsQ8epR02Sg4NUoLo7L7 PLz+7hvoCCw+IHDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3332413BCF; Fri, 11 Feb 2022 09:26:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8KddCt0rBmJ7EwAAMHmgww (envelope-from ); Fri, 11 Feb 2022 09:26:53 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 11 Feb 2022 10:26:45 +0100 Message-Id: <20220211092646.23748-8-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220211092646.23748-1-andrea.cervesato@suse.de> References: <20220211092646.23748-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH v1 7/8] Rewrite userns07.c using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/userns/userns07.c | 126 ++++++++---------- 1 file changed, 52 insertions(+), 74 deletions(-) diff --git a/testcases/kernel/containers/userns/userns07.c b/testcases/kernel/containers/userns/userns07.c index 49915969e..03b2a49fe 100644 --- a/testcases/kernel/containers/userns/userns07.c +++ b/testcases/kernel/containers/userns/userns07.c @@ -1,47 +1,29 @@ +// 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. + * Copyright (C) 2022 SUSE LLC Andrea Cervesato */ -/* +/*\ + * [Description] + * * Verify that: * The kernel imposes a limit of at least 32 nested levels on user namespaces. */ #define _GNU_SOURCE -#include -#include + #include -#include -#include -#include -#include -#include "userns_helper.h" -#include "test.h" +#include +#include +#include "common.h" +#include "tst_test.h" #define MAXNEST 32 -char *TCID = "userns07"; -int TST_TOTAL = 1; - static void setup(void) { check_newuser(); - tst_tmpdir(); - TST_CHECKPOINT_INIT(NULL); -} - -static void cleanup(void) -{ - tst_rmdir(); } static int child_fn1(void *arg) @@ -52,40 +34,42 @@ static int child_fn1(void *arg) int parentuid; int parentgid; - TST_SAFE_CHECKPOINT_WAIT(NULL, 0); + TST_CHECKPOINT_WAIT(0); - if (level == MAXNEST) + if (level == MAXNEST) { + tst_res(TPASS, "nested all children"); return 0; - cpid1 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, - (void *)child_fn1, (void *)(level + 1)); - if (cpid1 < 0) { - printf("level %ld:unexpected error: (%d) %s\n", - level, errno, strerror(errno)); + } + + TEST(ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, (void *)child_fn1, + (void *)(level + 1))); + if (TST_RET < 0) { + tst_res(TFAIL, "level %ld, unexpected error: (%d) %s", level, + TST_ERR, tst_strerrno(TST_ERR)); return 1; } + cpid1 = (int)TST_RET; + parentuid = geteuid(); parentgid = getegid(); - updatemap(cpid1, UID_MAP, 0, parentuid, NULL); - updatemap(cpid1, GID_MAP, 0, parentgid, NULL); + updatemap(cpid1, UID_MAP, 0, parentuid); + updatemap(cpid1, GID_MAP, 0, parentgid); - TST_SAFE_CHECKPOINT_WAKE(cleanup, 0); + TST_CHECKPOINT_WAKE(0); - if (waitpid(cpid1, &status, 0) == -1) - return 1; + SAFE_WAITPID(cpid1, &status, 0); + + if (WIFEXITED(status) && WEXITSTATUS(status) != 0) + tst_brk(TBROK, "child exited abnormally %s", tst_strstatus(status)); + else if (WIFSIGNALED(status)) + tst_brk(TBROK, "child was killed with signal = %d", WTERMSIG(status)); - if (WIFEXITED(status) && WEXITSTATUS(status) != 0) { - printf("child exited abnormally\n"); - return 1; - } else if (WIFSIGNALED(status)) { - printf("child was killed with signal = %d", WTERMSIG(status)); - return 1; - } return 0; } -static void test_max_nest(void) +static void run(void) { pid_t cpid1; int parentuid; @@ -93,41 +77,35 @@ static void test_max_nest(void) int fd; char path[BUFSIZ]; - cpid1 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, - (void *)child_fn1, (void *)0); + cpid1 = ltp_clone_quick(CLONE_NEWUSER | SIGCHLD, (void *)child_fn1, (void *)0); if (cpid1 < 0) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); + tst_brk(TBROK | TTERRNO, "clone failed"); parentuid = geteuid(); parentgid = getegid(); 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); - } - - updatemap(cpid1, UID_MAP, 0, parentuid, cleanup); - updatemap(cpid1, GID_MAP, 0, parentgid, cleanup); - TST_SAFE_CHECKPOINT_WAKE(cleanup, 0); - tst_record_childstatus(cleanup, cpid1); -} - -int main(int argc, char *argv[]) -{ - int lc; - - setup(); - tst_parse_opts(argc, argv, NULL, NULL); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - test_max_nest(); + fd = SAFE_OPEN(path, O_WRONLY, 0644); + SAFE_WRITE(1, fd, "deny", 4); + SAFE_CLOSE(fd); } - cleanup(); - tst_exit(); + updatemap(cpid1, UID_MAP, 0, parentuid); + updatemap(cpid1, GID_MAP, 0, parentgid); + + TST_CHECKPOINT_WAKE(0); } +static struct tst_test test = { + .setup = setup, + .test_all = run, + .needs_root = 1, + .needs_checkpoints = 1, + .needs_kconfigs = + (const char *[]){ + "CONFIG_USER_NS", + NULL, + }, +}; From patchwork Fri Feb 11 09:26:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1591544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=j7ABSQkL; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=lF26RnER; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jw7Zt0J7lz9s5B for ; Fri, 11 Feb 2022 20:28:21 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 01EDC3C9EF5 for ; Fri, 11 Feb 2022 10:28:20 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 6AE193C9888 for ; Fri, 11 Feb 2022 10:26:54 +0100 (CET) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id 070256008C2 for ; Fri, 11 Feb 2022 10:26:54 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8F8892113A; Fri, 11 Feb 2022 09:26:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1644571613; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JOoCZy/kNXQq3YBYjmP3dHc8D4Io1/zT0ltEvI4Hvl4=; b=j7ABSQkLy9xvQIEejkbJnWnHd+9So4650jH5uAwIhzG4NgWSRoDjhzQAIDBJ1CzLbdl67C n5w1n3zNbi0Gvn8JFeKFd3Gt6Rc+H6WmFBF8D82ER75XaJ4KaAMAvlz/GqrwXAbFXXAOCl yJSgyaJmF6NiWnZIdKCJCyuqF06RlAI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1644571613; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JOoCZy/kNXQq3YBYjmP3dHc8D4Io1/zT0ltEvI4Hvl4=; b=lF26RnER8wyNFuF7BkeNv7b24p8LyMHFVy4w4JD6Wgp8L0eivWteWcnYVBMtOyJoigOhSv xQm0hvl8xNpQQVBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 64C3E13BC3; Fri, 11 Feb 2022 09:26:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id WOqSFt0rBmJ7EwAAMHmgww (envelope-from ); Fri, 11 Feb 2022 09:26:53 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 11 Feb 2022 10:26:46 +0100 Message-Id: <20220211092646.23748-9-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220211092646.23748-1-andrea.cervesato@suse.de> References: <20220211092646.23748-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v1 8/8] Rewrite userns08.c using new LTP API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/userns/userns08.c | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/testcases/kernel/containers/userns/userns08.c b/testcases/kernel/containers/userns/userns08.c index c141b1aca..1935fcf11 100644 --- a/testcases/kernel/containers/userns/userns08.c +++ b/testcases/kernel/containers/userns/userns08.c @@ -17,6 +17,7 @@ * by (the real) root. So on the second level we reset dumpable to 1. * */ + #define _GNU_SOURCE #include #include @@ -30,16 +31,12 @@ static pid_t clone_newuser(void) { - const struct tst_clone_args cargs = { - CLONE_NEWUSER, - SIGCHLD - }; + const struct tst_clone_args cargs = { CLONE_NEWUSER, SIGCHLD }; return SAFE_CLONE(&cargs); } -static void write_mapping(const pid_t proc_in_ns, - const char *const id_mapping) +static void write_mapping(const pid_t proc_in_ns, const char *const id_mapping) { char proc_path[PATH_MAX]; int proc_dir; @@ -61,18 +58,19 @@ static void write_mapping(const pid_t proc_in_ns, static void ns_level2(void) { if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0)) - tst_res(TINFO | TERRNO, "Failed to set dumpable flag"); + tst_brk(TBROK | TTERRNO, "Failed to set dumpable flag"); + TST_CHECKPOINT_WAKE_AND_WAIT(1); - TST_EXP_FAIL(open("restricted", O_WRONLY), EACCES, - "Denied write access to ./restricted"); + TST_EXP_FAIL(open("restricted", O_WRONLY), EACCES, "Denied write access to ./restricted"); exit(0); } static void ns_level1(void) { - const char *const map_over_5 = "0 0 1\n1 1 1\n2 2 1\n3 3 1\n4 4 1\n5 5 990"; + const char *const map_over_5 = + "0 0 1\n1 1 1\n2 2 1\n3 3 1\n4 4 1\n5 5 990"; pid_t level2_proc; TST_CHECKPOINT_WAIT(0); @@ -89,7 +87,6 @@ static void ns_level1(void) write_mapping(level2_proc, map_over_5); TST_CHECKPOINT_WAKE(1); - tst_reap_children(); exit(0); } @@ -111,7 +108,6 @@ static void run(void) write_mapping(level1_proc, "0 100000 1000"); TST_CHECKPOINT_WAKE(0); - tst_reap_children(); } static void setup(void) @@ -130,17 +126,20 @@ static struct tst_test test = { .needs_checkpoints = 1, .needs_root = 1, .forks_child = 1, - .needs_kconfigs = (const char *[]) { - "CONFIG_USER_NS", - NULL - }, - .save_restore = (const char * const[]) { - "?/proc/sys/user/max_user_namespaces", - NULL, - }, - .tags = (const struct tst_tag[]) { - {"linux-git", "d2f007dbe7e4"}, - {"CVE", "CVE-2018-18955"}, - {} - }, + .needs_kconfigs = + (const char *[]){ + "CONFIG_USER_NS", + NULL, + }, + .save_restore = + (const char *const[]){ + "?/proc/sys/user/max_user_namespaces", + NULL, + }, + .tags = + (const struct tst_tag[]){ + { "linux-git", "d2f007dbe7e4" }, + { "CVE", "CVE-2018-18955" }, + {}, + }, };