From patchwork Fri Jul 22 12:04:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1659520 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=n4/nOMQ7; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lq7SW3kt4z9sGV for ; Fri, 22 Jul 2022 22:06:03 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id D15EC3CA0B0 for ; Fri, 22 Jul 2022 14:06:00 +0200 (CEST) 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 [IPv6:2001:4b78:1:20::5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id E31943C9465 for ; Fri, 22 Jul 2022 14:05:36 +0200 (CEST) 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 06A1F60020A for ; Fri, 22 Jul 2022 14:05:35 +0200 (CEST) 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 411182032A; Fri, 22 Jul 2022 12:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1658491535; 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=8OI1AzWTGVbtXz/WcqGEfE5golnUCTHBMhjtYb9IA8Q=; b=n4/nOMQ7FvCh+N9H0tAeWxp0vz1KhuZlqiG1KJXARxce+isDhoTVx24x9mOknCuUvfaC5Q soNPJPdUFVTr9BYfJKXuLQUG2Pbn9bcfhfaRkP7TcD1Uq1GemVLOkRzBYlu8REqgRhLT5/ L/iPAjczc7UBRe4R2LQ5xueR/OGk78M= 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 0D623134A9; Fri, 22 Jul 2022 12:05:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 2JZeAI+S2mJULwAAMHmgww (envelope-from ); Fri, 22 Jul 2022 12:05:35 +0000 To: ltp@lists.linux.it Date: Fri, 22 Jul 2022 14:04:55 +0200 Message-Id: <20220722120501.28670-2-andrea.cervesato@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722120501.28670-1-andrea.cervesato@suse.com> References: <20220722120501.28670-1-andrea.cervesato@suse.com> 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 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 v3 1/7] Add more safe macros for mqueue 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: , X-Patchwork-Original-From: Andrea Cervesato via ltp From: Andrea Cervesato Reply-To: Andrea Cervesato Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Added SAFE_MQ_UNLINK and SAFE_MQ_CLOSE in tst_safe_posix_ipc.h Signed-off-by: Andrea Cervesato Reviewed-by: Petr Vorel --- include/tst_safe_posix_ipc.h | 45 ++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/tst_safe_posix_ipc.h b/include/tst_safe_posix_ipc.h index b60c12c9e..5bfef03a9 100644 --- a/include/tst_safe_posix_ipc.h +++ b/include/tst_safe_posix_ipc.h @@ -12,6 +12,12 @@ #define SAFE_MQ_OPEN(pathname, oflags, ...) \ safe_mq_open(__FILE__, __LINE__, (pathname), (oflags), ##__VA_ARGS__) +#define SAFE_MQ_CLOSE(__mqdes) \ + safe_mq_close(__FILE__, __LINE__, (__mqdes)) + +#define SAFE_MQ_UNLINK(name) \ + safe_mq_unlink(__FILE__, __LINE__, (name)) + static inline int safe_mq_open(const char *file, const int lineno, const char *pathname, int oflags, ...) { @@ -41,6 +47,45 @@ static inline int safe_mq_open(const char *file, const int lineno, tst_brk_(file, lineno, TBROK | TERRNO, "mq_open(%s,%d,%04o,%p) failed", pathname, oflags, mode, attr); + } else if (rval < 0) { + tst_brk_(file, lineno, TBROK | TERRNO, + "Invalid mq_open(%s) return value %d", pathname, rval); + } + + return rval; +} + +static inline int safe_mq_close(const char *file, const int lineno, + mqd_t __mqdes) +{ + int rval; + + rval = mq_close(__mqdes); + + if (rval == -1) { + tst_brk_(file, lineno, TBROK | TERRNO, + "mq_close(%d) failed", __mqdes); + } else if (rval < 0) { + tst_brk_(file, lineno, TBROK | TERRNO, + "Invalid mq_close(%d) return value %d", __mqdes, rval); + } + + return rval; +} + +static inline int safe_mq_unlink(const char *file, const int lineno, + const char* name) +{ + int rval; + + rval = mq_unlink(name); + + if (rval == -1) { + tst_brk_(file, lineno, TBROK | TERRNO, + "mq_unlink(%s) failed", name); + } else if (rval < 0) { + tst_brk_(file, lineno, TBROK | TERRNO, + "Invalid mq_unlink(%s) return value %d", name, rval); } return rval; From patchwork Fri Jul 22 12:04:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1659521 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=pCs0xJ9Y; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lq7Sj59Mbz9sGV for ; Fri, 22 Jul 2022 22:06:13 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E95503CA0DB for ; Fri, 22 Jul 2022 14:06:10 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id ED0033C989D for ; Fri, 22 Jul 2022 14:05:36 +0200 (CEST) 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-7.smtp.seeweb.it (Postfix) with ESMTPS id 0FF10200B71 for ; Fri, 22 Jul 2022 14:05:35 +0200 (CEST) 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 8847B2032C; Fri, 22 Jul 2022 12:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1658491535; 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=yJiv/u4Zae6UH5QaPa1enwS3CX+Ky1F74ifNwhR7aQE=; b=pCs0xJ9YX39u1AxCxkLxATWK0PlA6Tv3NsapGcBoH/OA+tRC3oPZzwbWdQQnYcpEXd5LCL v86yXnz3FmAWOIRz03yBzE72eWgUkaorH4+Eiw+F2SHxvFK5PV2N9xDBKq6Ln3rgYNETqz nA/8zs+0ie7mun164BzHPl1fYcXFMYM= 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 5461E134A9; Fri, 22 Jul 2022 12:05:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 6KfMEY+S2mJULwAAMHmgww (envelope-from ); Fri, 22 Jul 2022 12:05:35 +0000 To: ltp@lists.linux.it Date: Fri, 22 Jul 2022 14:04:56 +0200 Message-Id: <20220722120501.28670-3-andrea.cervesato@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722120501.28670-1-andrea.cervesato@suse.com> References: <20220722120501.28670-1-andrea.cervesato@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-7.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 autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v3 2/7] Refactor mqns_01 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: , X-Patchwork-Original-From: Andrea Cervesato via ltp From: Andrea Cervesato Reply-To: Andrea Cervesato Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- runtest/containers | 3 +- testcases/kernel/containers/mqns/common.h | 101 +++++++++++ testcases/kernel/containers/mqns/mqns_01.c | 193 +++++++-------------- 3 files changed, 166 insertions(+), 131 deletions(-) create mode 100644 testcases/kernel/containers/mqns/common.h diff --git a/runtest/containers b/runtest/containers index 2637b62fe..863a964ad 100644 --- a/runtest/containers +++ b/runtest/containers @@ -16,7 +16,8 @@ pidns31 pidns31 pidns32 pidns32 mqns_01 mqns_01 -mqns_01_clone mqns_01 -clone +mqns_01_clone mqns_01 -m clone +mqns_01_unshare mqns_01 -m unshare mqns_02 mqns_02 mqns_02_clone mqns_02 -clone mqns_03 mqns_03 diff --git a/testcases/kernel/containers/mqns/common.h b/testcases/kernel/containers/mqns/common.h new file mode 100644 index 000000000..92a77b566 --- /dev/null +++ b/testcases/kernel/containers/mqns/common.h @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +#ifndef MQNS_H +#define MQNS_H + +#include +#include "lapi/namespaces_constants.h" +#include "tst_test.h" +#include "tst_safe_posix_ipc.h" + +enum { + T_CLONE, + T_UNSHARE, + T_NONE, +}; + +static int dummy_child1(void *v) +{ + (void)v; + return 0; +} + +static inline void check_newipc(void) +{ + int pid, status; + + pid = ltp_clone_quick(CLONE_NEWIPC | SIGCHLD, dummy_child1, NULL); + if (pid < 0) + tst_brk(TCONF | TERRNO, "CLONE_NEWIPC not supported"); + + SAFE_WAITPID(pid, &status, 0); +} + +static inline int get_clone_unshare_enum(const char* str_op) +{ + if (!str_op) + return T_NONE; + else if (!strcmp(str_op, "clone")) + return T_CLONE; + else if (!strcmp(str_op, "unshare")) + return T_UNSHARE; + + return T_NONE; +} + +static void clone_test(unsigned long clone_flags, int (*fn1)(void *arg), void *arg1) +{ + int pid; + + pid = ltp_clone_quick(clone_flags | SIGCHLD, fn1, arg1); + if (pid < 0) + tst_brk(TBROK | TERRNO, "ltp_clone_quick error"); +} + +static void unshare_test(unsigned long clone_flags, int (*fn1)(void *arg), void *arg1) +{ + int pid; + + pid = SAFE_FORK(); + if (!pid) { + SAFE_UNSHARE(clone_flags); + + fn1(arg1); + exit(0); + } +} + +static void plain_test(int (*fn1)(void *arg), void *arg1) +{ + int pid; + + pid = SAFE_FORK(); + if (!pid) { + fn1(arg1); + exit(0); + } +} + +static void clone_unshare_test(int use_clone, unsigned long clone_flags, + int (*fn1)(void *arg), void *arg1) +{ + switch (use_clone) { + case T_NONE: + plain_test(fn1, arg1); + break; + case T_CLONE: + clone_test(clone_flags, fn1, arg1); + break; + case T_UNSHARE: + unshare_test(clone_flags, fn1, arg1); + break; + default: + tst_brk(TBROK, "%s: bad use_clone option: %d", __FUNCTION__, use_clone); + break; + } +} + +#endif /* MQNS_H */ diff --git a/testcases/kernel/containers/mqns/mqns_01.c b/testcases/kernel/containers/mqns/mqns_01.c index 1d109e020..a34dc4f66 100644 --- a/testcases/kernel/containers/mqns/mqns_01.c +++ b/testcases/kernel/containers/mqns/mqns_01.c @@ -1,148 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) International Business Machines Corp., 2009 -* Copyright (c) Nadia Derbey, 2009 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -* -* Author: Nadia Derbey -* -* Check mqns isolation: father mqns cannot be accessed from newinstance -* -* Mount mqueue fs -* Create a posix mq -->mq1 -* unshare -* In unshared process: -* Mount newinstance mqueuefs -* Check that mq1 is not readable from new ns - -***************************************************************************/ - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#include -#include -#include -#include -#include -#include -#include "mqns.h" -#include "mqns_helper.h" - -char *TCID = "posixmq_namespace_01"; -int TST_TOTAL = 1; - -int p1[2]; -int p2[2]; - -int check_mqueue(void *vtest) + * Copyright (c) International Business Machines Corp., 2009 + * Copyright (c) Nadia Derbey, 2009 + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +/*\ + * [Description] + * + * Create a mqueue inside the parent and check if it can be accessed from + * the isolated/forked child namespace. + */ + +#include "common.h" + +#define MQNAME "/MQ1" + +static mqd_t mqd; +static char *str_op; +static int use_clone; + +static int check_mqueue(LTP_ATTRIBUTE_UNUSED void *vtest) { - char buf[30]; - mqd_t mqd; + mqd_t mqd1; - (void) vtest; + mqd1 = mq_open(MQNAME, O_RDONLY); - close(p1[1]); - close(p2[0]); + if (use_clone == T_NONE) { + if (mqd1 == -1) + tst_res(TFAIL, "Queue has been accessed form plain cloned process"); + else + tst_res(TPASS, "Can't access to queue from plain cloned process"); - if (read(p1[0], buf, strlen("go") + 1) < 0) { - printf("read(p1[0], ...) failed: %s\n", strerror(errno)); - exit(1); - } - mqd = tst_syscall(__NR_mq_open, NOSLASH_MQ1, O_RDONLY); - if (mqd == -1) { - if (write(p2[1], "notfnd", strlen("notfnd") + 1) < 0) { - perror("write(p2[1], ...) failed"); - exit(1); - } - } else { - if (write(p2[1], "exists", strlen("exists") + 1) < 0) { - perror("write(p2[1], \"exists\", 7) failed"); - exit(1); - } else if (mq_close(mqd) < 0) { - perror("mq_close(mqd) failed"); - exit(1); - } + return 0; } - exit(0); + if (mqd1 == -1) + tst_res(TPASS, "Can't access to queue from isolated process"); + else + tst_res(TFAIL, "Queue has been accessed from isolated process"); + + return 0; } -static void setup(void) +static void run(void) { - tst_require_root(); - check_mqns(); + tst_res(TINFO, "Checking namespaces isolation from parent to child"); + + clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL); } -int main(int argc, char *argv[]) +static void setup(void) { - int r; - mqd_t mqd; - char buf[30]; - int use_clone = T_UNSHARE; - - setup(); - - if (argc == 2 && strcmp(argv[1], "-clone") == 0) { - tst_resm(TINFO, - "Testing posix mq namespaces through clone(2)."); - use_clone = T_CLONE; - } else - tst_resm(TINFO, - "Testing posix mq namespaces through unshare(2)."); - - if (pipe(p1) == -1 || pipe(p2) == -1) { - tst_brkm(TBROK | TERRNO, NULL, "pipe failed"); - } + use_clone = get_clone_unshare_enum(str_op); - mqd = tst_syscall(__NR_mq_open, NOSLASH_MQ1, O_RDWR | O_CREAT | O_EXCL, - 0777, NULL); - if (mqd == -1) { - perror("mq_open"); - tst_brkm(TFAIL, NULL, "mq_open failed"); - } + if (use_clone != T_NONE) + check_newipc(); - tst_resm(TINFO, "Checking namespaces isolation from parent to child"); - /* fire off the test */ - r = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL); - if (r < 0) { - tst_resm(TFAIL, "failed clone/unshare"); - mq_close(mqd); - tst_syscall(__NR_mq_unlink, NOSLASH_MQ1); - tst_exit(); - } - - close(p1[0]); - close(p2[1]); - if (write(p1[1], "go", strlen("go") + 1) < 0) - tst_resm(TBROK | TERRNO, "write(p1[1], \"go\", ...) failed"); - else if (read(p2[0], buf, 7) < 0) - tst_resm(TBROK | TERRNO, "read(p2[0], buf, ...) failed"); - else { - if (!strcmp(buf, "exists")) { - tst_resm(TFAIL, "child process found mqueue"); - } else if (!strcmp(buf, "notfnd")) { - tst_resm(TPASS, "child process didn't find mqueue"); - } else { - tst_resm(TFAIL, "UNKNOWN RESULT"); - } - } + mqd = SAFE_MQ_OPEN(MQNAME, O_RDWR | O_CREAT | O_EXCL, 0777, NULL); +} - /* destroy the mqueue */ - if (mq_close(mqd) == -1) { - tst_brkm(TBROK | TERRNO, NULL, "mq_close failed"); +static void cleanup(void) +{ + if (mqd != -1) { + SAFE_MQ_CLOSE(mqd); + SAFE_MQ_UNLINK(MQNAME); } - tst_syscall(__NR_mq_unlink, NOSLASH_MQ1); - - tst_exit(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .needs_root = 1, + .forks_child = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +}; From patchwork Fri Jul 22 12:04:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1659519 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=tAyeAaO0; 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 (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lq7SK1hg5z9sGV for ; Fri, 22 Jul 2022 22:05:53 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E54C13C9FEF for ; Fri, 22 Jul 2022 14:05:49 +0200 (CEST) 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 ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id A87BA3C9465 for ; Fri, 22 Jul 2022 14:05:36 +0200 (CEST) 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 2CE13601195 for ; Fri, 22 Jul 2022 14:05:36 +0200 (CEST) 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 CE6332032E; Fri, 22 Jul 2022 12:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1658491535; 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=WfROVEy+8jnWPUFAF3qE5DmCh4LnyZtRtz72KSdNqtY=; b=tAyeAaO0sRAhvOd7PM84G+tDzouUgkXTspPQ40/oup/fmk1nzQ/k40sKRrjTrIa/MYx8bN 06x60K2NHwYpPQ7ckUlqpQC9EZe3ZnIhumpAmYtY+rmG2CWtEZ4eJlEDorF8jLEb97aCkW /6Gf4dyFAPwzbSjXT3/JlHdkRdvRjmQ= 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 9B937134A9; Fri, 22 Jul 2022 12:05:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id IE09I4+S2mJULwAAMHmgww (envelope-from ); Fri, 22 Jul 2022 12:05:35 +0000 To: ltp@lists.linux.it Date: Fri, 22 Jul 2022 14:04:57 +0200 Message-Id: <20220722120501.28670-4-andrea.cervesato@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722120501.28670-1-andrea.cervesato@suse.com> References: <20220722120501.28670-1-andrea.cervesato@suse.com> 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 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 v3 3/7] Refactor mqns_02 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: , X-Patchwork-Original-From: Andrea Cervesato via ltp From: Andrea Cervesato Reply-To: Andrea Cervesato Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- runtest/containers | 3 +- testcases/kernel/containers/mqns/mqns_02.c | 225 ++++++--------------- 2 files changed, 67 insertions(+), 161 deletions(-) diff --git a/runtest/containers b/runtest/containers index 863a964ad..4042ced4c 100644 --- a/runtest/containers +++ b/runtest/containers @@ -19,7 +19,8 @@ mqns_01 mqns_01 mqns_01_clone mqns_01 -m clone mqns_01_unshare mqns_01 -m unshare mqns_02 mqns_02 -mqns_02_clone mqns_02 -clone +mqns_02_clone mqns_02 -m clone +mqns_02_unshare mqns_02 -m unshare mqns_03 mqns_03 mqns_03_clone mqns_03 -clone mqns_04 mqns_04 diff --git a/testcases/kernel/containers/mqns/mqns_02.c b/testcases/kernel/containers/mqns/mqns_02.c index d4e785b59..4383fef73 100644 --- a/testcases/kernel/containers/mqns/mqns_02.c +++ b/testcases/kernel/containers/mqns/mqns_02.c @@ -1,180 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) International Business Machines Corp., 2009 -* Copyright (c) Nadia Derbey, 2009 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -* -* Author: Nadia Derbey -* -* Check mqns isolation: child mqns cannot be accessed from father -* -* Mount mqueue fs -* unshare -* In unshared process: -* Mount newinstance mqueuefs -* Create a posix mq -->mq1 -* Check that mq1 is not readable from father -* -* Changelog: -* Dec 16: accomodate new mqns semantics (Serge Hallyn) - -***************************************************************************/ - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#include -#include -#include -#include -#include -#include -#include "mqns.h" -#include "mqns_helper.h" - -char *TCID = "posixmq_namespace_02"; -int TST_TOTAL = 1; - -int p1[2]; -int p2[2]; - -int check_mqueue(void *vtest) + * Copyright (c) International Business Machines Corp., 2009 + * Copyright (c) Nadia Derbey, 2009 + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +/*\ + * [Description] + * + * Create a mqueue with the same name in both parent and isolated/forked child, + * then check namespace isolation. + */ + +#include "common.h" + +#define MQNAME "/MQ1" + +static mqd_t mqd; +static char *str_op; +static int use_clone; + +static int check_mqueue(LTP_ATTRIBUTE_UNUSED void *vtest) { - char buf[30]; - mqd_t mqd; + mqd_t mqd1; - (void) vtest; + mqd1 = mq_open(MQNAME, O_RDWR | O_CREAT | O_EXCL, 0777, NULL); - close(p1[1]); - close(p2[0]); + if (use_clone == T_NONE) { + if (mqd1 == -1) + tst_res(TPASS, "Can't create queue from plain cloned process"); + else + tst_res(TFAIL, "Queue has been created form plain cloned process"); - if (read(p1[0], buf, 3) < 0) { - perror("read(p1[0], ..) failed"); - exit(1); - } else { + return 0; + } - mqd = - tst_syscall(__NR_mq_open, NOSLASH_MQ1, - O_RDWR | O_CREAT | O_EXCL, 0777, NULL); - if (mqd == -1) { - if (write(p2[1], "mqfail", strlen("mqfail") + 1) < 0) { - perror("write(p2[1], \"mqfail\", ..) failed"); - exit(1); - } - } else { - - if (write(p2[1], "mqopen", strlen("mqopen") + 1) < 0) { - perror("write(p2[1], \"mqopen\", ..) failed"); - exit(1); - } else { - - if (read(p1[0], buf, 5) < 0) { - perror("read(p1[0], ..) failed"); - exit(1); - } else { - - /* destroy the mqueue */ - if (mq_close(mqd) < 0) { - perror("mq_close(mqd) failed"); - exit(1); - } else if (tst_syscall(__NR_mq_unlink, - NOSLASH_MQ1) < 0) { - perror("mq_unlink(" NOSLASH_MQ1 - ") failed"); - exit(1); - } else if (write(p2[1], "done", - strlen("done") + 1) - < 0) { - perror("write(p2[1], " - "\"done\", ..) failed"); - exit(1); - } - - } - - } - - } + if (mqd1 == -1) { + tst_res(TFAIL, "Queue hasn't been created from isolated process"); + } else { + tst_res(TPASS, "Created queue from isolated process"); + SAFE_MQ_CLOSE(mqd1); + SAFE_MQ_UNLINK(MQNAME); } - exit(0); + return 0; } -static void setup(void) +static void run(void) { - tst_require_root(); - check_mqns(); + tst_res(TINFO, "Checking namespaces isolation from parent to child"); + + clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL); } -int main(int argc, char *argv[]) +static void setup(void) { - int r; - mqd_t mqd; - char buf[30]; - int use_clone = T_UNSHARE; - - setup(); - - if (argc == 2 && strcmp(argv[1], "-clone") == 0) { - tst_resm(TINFO, - "Testing posix mq namespaces through clone(2)."); - use_clone = T_CLONE; - } else - tst_resm(TINFO, - "Testing posix mq namespaces through unshare(2)."); - - if (pipe(p1) == -1 || pipe(p2) == -1) { - tst_brkm(TBROK | TERRNO, NULL, "pipe"); - } + use_clone = get_clone_unshare_enum(str_op); - /* fire off the test */ - r = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL); - if (r < 0) { - tst_brkm(TFAIL, NULL, "failed clone/unshare"); - } + if (use_clone != T_NONE) + check_newipc(); - tst_resm(TINFO, "Checking namespaces isolation (child to parent)"); - - close(p1[0]); - close(p2[1]); - if (write(p1[1], "go", strlen("go") + 1) < 0) { - tst_brkm(TBROK, NULL, "write(p1[1], \"go\", ..) failed"); - } + mqd = SAFE_MQ_OPEN(MQNAME, O_RDWR | O_CREAT | O_EXCL, 0777, NULL); +} - if (read(p2[0], buf, 7) < 0) { - tst_resm(TBROK | TERRNO, "read(p2[0], ..) failed"); - } else if (!strcmp(buf, "mqfail")) { - tst_resm(TFAIL, "child process could not create mqueue"); - umount(DEV_MQUEUE); - } else if (strcmp(buf, "mqopen")) { - tst_resm(TFAIL, "child process could not create mqueue"); - umount(DEV_MQUEUE); - } else { - mqd = tst_syscall(__NR_mq_open, NOSLASH_MQ1, O_RDONLY); - if (mqd == -1) { - tst_resm(TPASS, - "Parent process can't see the mqueue"); - } else { - tst_resm(TFAIL | TERRNO, - "Parent process found mqueue"); - mq_close(mqd); - } - if (write(p1[1], "cont", 5) < 0) { - tst_resm(TBROK | TERRNO, "write(p1[1], ..) failed"); - } - read(p2[0], buf, 7); +static void cleanup(void) +{ + if (mqd != -1) { + SAFE_MQ_CLOSE(mqd); + SAFE_MQ_UNLINK(MQNAME); } - - tst_exit(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .needs_root = 1, + .forks_child = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +}; From patchwork Fri Jul 22 12:04:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1659525 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=pSbY96z3; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lq7TN16svz9sGV for ; Fri, 22 Jul 2022 22:06:47 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 02C3F3C9E00 for ; Fri, 22 Jul 2022 14:06:45 +0200 (CEST) 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 [217.194.8.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 602283C9F94 for ; Fri, 22 Jul 2022 14:05:38 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) (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 96DF91A00CA0 for ; Fri, 22 Jul 2022 14:05:37 +0200 (CEST) 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 21CFC34888; Fri, 22 Jul 2022 12:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1658491536; 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=eCyTVy6ii8ZqOMZSX+hyw5niMaTNviGKgl4MCkix7MQ=; b=pSbY96z3fuf1fYi1piE18QshHSwsPOx2vKsVRr0YO6e6LE9zv8Yv0QSzldz/rKRuLPtgo5 bvWSvVzeb0CBKabavrYSZBAAgZDD9cdQKLTGLv+Rhhc2m+A3bbSMP+zL4qWD9BPKeQZetU iXbW/3GQuH2BYMTpoRmKc5o1jptvnWY= 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 E2666134A9; Fri, 22 Jul 2022 12:05:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8Pl3NI+S2mJULwAAMHmgww (envelope-from ); Fri, 22 Jul 2022 12:05:35 +0000 To: ltp@lists.linux.it Date: Fri, 22 Jul 2022 14:04:58 +0200 Message-Id: <20220722120501.28670-5-andrea.cervesato@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722120501.28670-1-andrea.cervesato@suse.com> References: <20220722120501.28670-1-andrea.cervesato@suse.com> 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 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 v3 4/7] Refactor mqns_03 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: , X-Patchwork-Original-From: Andrea Cervesato via ltp From: Andrea Cervesato Reply-To: Andrea Cervesato Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- runtest/containers | 3 +- testcases/kernel/containers/mqns/mqns_03.c | 271 ++++++++------------- 2 files changed, 100 insertions(+), 174 deletions(-) diff --git a/runtest/containers b/runtest/containers index 4042ced4c..496b47037 100644 --- a/runtest/containers +++ b/runtest/containers @@ -22,7 +22,8 @@ mqns_02 mqns_02 mqns_02_clone mqns_02 -m clone mqns_02_unshare mqns_02 -m unshare mqns_03 mqns_03 -mqns_03_clone mqns_03 -clone +mqns_03_clone mqns_03 -m clone +mqns_03_unshare mqns_03 -m unshare mqns_04 mqns_04 mqns_04_clone mqns_04 -clone diff --git a/testcases/kernel/containers/mqns/mqns_03.c b/testcases/kernel/containers/mqns/mqns_03.c index a7452b970..5914a2a9b 100644 --- a/testcases/kernel/containers/mqns/mqns_03.c +++ b/testcases/kernel/containers/mqns/mqns_03.c @@ -1,207 +1,132 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) International Business Machines Corp., 2009 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -* -* Author: Serge Hallyn -* -* Check ipcns+sb longevity -* -* Mount mqueue fs -* unshare -* In unshared process: -* Create "/mq1" with mq_open() -* Mount mqueuefs -* Check that /mq1 exists -* Create /dev/mqueue/mq2 through vfs (create(2)) -* Umount /dev/mqueue -* Remount /dev/mqueue -* Check that both /mq1 and /mq2 exist - -***************************************************************************/ - -#ifndef _GNU_SOURCE + * Copyright (c) International Business Machines Corp., 2009 + * Copyright (c) Serge Hallyn + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +/*\ + * [Description] + * + * Test mqueuefs from an isolated/forked process namespace. + * + * [Algorithm] + * + * - create /MQ1 + * - mount mqueue inside the temporary folder + * - check for /MQ1 existance + * - create /MQ2 inside the temporary folder + * - umount + * - mount mqueue inside the temporary folder + * - check /MQ1 existance + * - check /MQ2 existance + * - umount + */ #define _GNU_SOURCE -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "mqns.h" -#include "mqns_helper.h" -char *TCID = "posixmq_namespace_03"; -int TST_TOTAL = 1; +#include +#include "common.h" +#include "tst_safe_stdio.h" -int p1[2]; -int p2[2]; +#define MQNAME1 "/MQ1" +#define MQNAME2 "/MQ2" -#define FNAM1 DEV_MQUEUE2 SLASH_MQ1 -#define FNAM2 DEV_MQUEUE2 SLASH_MQ2 +static char *str_op; +static int use_clone; +static char *devdir; +static char *mqueue1; +static char *mqueue2; +static int *mq_freed; -int check_mqueue(void *vtest) +static int check_mqueue(LTP_ATTRIBUTE_UNUSED void *vtest) { - char buf[30]; - mqd_t mqd; int rc; + mqd_t mqd; struct stat statbuf; - (void) vtest; + mqd = SAFE_MQ_OPEN(MQNAME1, O_RDWR | O_CREAT | O_EXCL, 0777, NULL); - close(p1[1]); - close(p2[0]); + SAFE_MQ_CLOSE(mqd); - if (read(p1[0], buf, 3) != 3) { /* go */ - perror("read failed"); - exit(1); - } + SAFE_MOUNT("mqueue", devdir, "mqueue", 0, NULL); - mqd = tst_syscall(__NR_mq_open, NOSLASH_MQ1, O_RDWR | O_CREAT | O_EXCL, - 0755, NULL); - if (mqd == -1) { - write(p2[1], "mqfail", 7); - exit(1); - } + SAFE_STAT(mqueue1, &statbuf); + tst_res(TPASS, "%s exists at first mount", mqueue1); - mq_close(mqd); + rc = SAFE_CREAT(mqueue2, 0755); + SAFE_CLOSE(rc); - rc = mount("mqueue", DEV_MQUEUE2, "mqueue", 0, NULL); - if (rc == -1) { - write(p2[1], "mount1", 7); - exit(1); - } + SAFE_UMOUNT(devdir); - rc = stat(FNAM1, &statbuf); - if (rc == -1) { - write(p2[1], "stat1", 6); - exit(1); - } + SAFE_MOUNT("mqueue", devdir, "mqueue", 0, NULL); - rc = creat(FNAM2, 0755); - if (rc == -1) { - write(p2[1], "creat", 6); - exit(1); - } + SAFE_STAT(mqueue1, &statbuf); + tst_res(TPASS, "%s exists at second mount", mqueue1); - close(rc); + SAFE_STAT(mqueue2, &statbuf); + tst_res(TPASS, "%s exists at second mount", mqueue2); - rc = umount(DEV_MQUEUE2); - if (rc == -1) { - write(p2[1], "umount", 7); - exit(1); - } + SAFE_UMOUNT(devdir); - rc = mount("mqueue", DEV_MQUEUE2, "mqueue", 0, NULL); - if (rc == -1) { - write(p2[1], "mount2", 7); - exit(1); - } + SAFE_MQ_UNLINK(MQNAME1); + SAFE_MQ_UNLINK(MQNAME2); - rc = stat(FNAM1, &statbuf); - if (rc == -1) { - write(p2[1], "stat2", 7); - exit(1); - } + *mq_freed = 1; - rc = stat(FNAM2, &statbuf); - if (rc == -1) { - write(p2[1], "stat3", 7); - exit(1); - } + return 0; +} - write(p2[1], "done", 5); +static void run(void) +{ + tst_res(TINFO, "Checking correct umount+remount of mqueuefs"); - exit(0); + clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL); } static void setup(void) { - tst_require_root(); - check_mqns(); + char *tmpdir; + + use_clone = get_clone_unshare_enum(str_op); + + if (use_clone != T_NONE) + check_newipc(); + + tmpdir = tst_get_tmpdir(); + + SAFE_ASPRINTF(&devdir, "%s/mqueue", tmpdir); + SAFE_MKDIR(devdir, 0755); + + SAFE_ASPRINTF(&mqueue1, "%s" MQNAME1, devdir); + SAFE_ASPRINTF(&mqueue2, "%s" MQNAME2, devdir); + + mq_freed = SAFE_MMAP(NULL, + sizeof(int), + PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANONYMOUS, + -1, 0); } -int main(int argc, char *argv[]) +static void cleanup(void) { - int r; - char buf[30]; - int use_clone = T_UNSHARE; - - setup(); - - if (argc == 2 && strcmp(argv[1], "-clone") == 0) { - tst_resm(TINFO, "Testing posix mq namespaces through clone(2)"); - use_clone = T_CLONE; - } else - tst_resm(TINFO, - "Testing posix mq namespaces through unshare(2)"); - - if (pipe(p1) == -1 || pipe(p2) == -1) - tst_brkm(TBROK | TERRNO, NULL, "pipe failed"); - - /* fire off the test */ - r = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL); - if (r < 0) { - tst_brkm(TBROK | TERRNO, NULL, "failed clone/unshare"); - } + if (tst_is_mounted(devdir)) + SAFE_UMOUNT(devdir); - tst_resm(TINFO, "Checking correct umount+remount of mqueuefs"); - - mkdir(DEV_MQUEUE2, 0755); - - close(p1[0]); - close(p2[1]); - write(p1[1], "go", 3); - - read(p2[0], buf, 7); - r = TFAIL; - if (!strcmp(buf, "mqfail")) { - tst_resm(TFAIL, "child process could not create mqueue"); - goto fail; - } else if (!strcmp(buf, "mount1")) { - tst_resm(TFAIL, "child process could not mount mqueue"); - goto fail; - } else if (!strcmp(buf, "stat1x")) { - tst_resm(TFAIL, "mq created by child is not in mqueuefs"); - goto fail; - } else if (!strcmp(buf, "creat")) { - tst_resm(TFAIL, "child couldn't creat mq through mqueuefs"); - goto fail; - } else if (!strcmp(buf, "umount")) { - tst_resm(TFAIL, "child couldn't umount mqueuefs"); - goto fail; - } else if (!strcmp(buf, "mount2")) { - tst_resm(TFAIL, "child couldn't remount mqueuefs"); - goto fail; - } else if (!strcmp(buf, "stat2")) { - tst_resm(TFAIL, - "mq_open()d file gone after remount of mqueuefs"); - goto fail; - } else if (!strcmp(buf, "stat3")) { - tst_resm(TFAIL, - "creat(2)'d file gone after remount of mqueuefs"); - goto fail; + if (!*mq_freed) { + SAFE_MQ_UNLINK(MQNAME1); + SAFE_MQ_UNLINK(MQNAME2); } - - tst_resm(TPASS, "umount+remount of mqueuefs remounted the right fs"); - - r = 0; -fail: - umount(DEV_MQUEUE2); - rmdir(DEV_MQUEUE2); - tst_exit(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .needs_root = 1, + .forks_child = 1, + .needs_tmpdir = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +}; From patchwork Fri Jul 22 12:04:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1659523 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=kqUonhxw; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lq7Sy09p7z9sGV for ; Fri, 22 Jul 2022 22:06:25 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 68C4F3CA0EE for ; Fri, 22 Jul 2022 14:06:23 +0200 (CEST) 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 [217.194.8.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 4D1B73C9F7C for ; Fri, 22 Jul 2022 14:05:38 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) (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 95C831A002C5 for ; Fri, 22 Jul 2022 14:05:37 +0200 (CEST) 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 670E13488E; Fri, 22 Jul 2022 12:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1658491536; 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=FC7DjChj21eBu5cdQflup5sOlGz064VrtPfBAxa1LB4=; b=kqUonhxw+hBheIlV8MVTPCsRYRViXi7PYHK7oLLDvqQgxXlOvqWtbaB7jgoYeDqHthfFA+ /Nn82D3jxztTZgyUf1JlEo16V856kIz1Lg8qyFSvJvpUYsVHGUISIYJRFA4iTt8JIXdvQK jSMy/xzn8so4pfrcrRI+7pwxbkf4nYQ= 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 33C28134A9; Fri, 22 Jul 2022 12:05:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wA7mCZCS2mJULwAAMHmgww (envelope-from ); Fri, 22 Jul 2022 12:05:36 +0000 To: ltp@lists.linux.it Date: Fri, 22 Jul 2022 14:04:59 +0200 Message-Id: <20220722120501.28670-6-andrea.cervesato@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722120501.28670-1-andrea.cervesato@suse.com> References: <20220722120501.28670-1-andrea.cervesato@suse.com> 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 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 v3 5/7] Refactor mqns_04 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: , X-Patchwork-Original-From: Andrea Cervesato via ltp From: Andrea Cervesato Reply-To: Andrea Cervesato Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- runtest/containers | 3 +- testcases/kernel/containers/mqns/mqns_04.c | 265 +++++++++------------ 2 files changed, 114 insertions(+), 154 deletions(-) diff --git a/runtest/containers b/runtest/containers index 496b47037..6728cb50c 100644 --- a/runtest/containers +++ b/runtest/containers @@ -25,7 +25,8 @@ mqns_03 mqns_03 mqns_03_clone mqns_03 -m clone mqns_03_unshare mqns_03 -m unshare mqns_04 mqns_04 -mqns_04_clone mqns_04 -clone +mqns_04_clone mqns_04 -m clone +mqns_04_unshare mqns_04 -m unshare netns_netlink netns_netlink netns_breakns_ip_ipv4_netlink netns_breakns.sh diff --git a/testcases/kernel/containers/mqns/mqns_04.c b/testcases/kernel/containers/mqns/mqns_04.c index d07a85c04..95ff18ef2 100644 --- a/testcases/kernel/containers/mqns/mqns_04.c +++ b/testcases/kernel/containers/mqns/mqns_04.c @@ -1,187 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) International Business Machines Corp., 2009 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -* -* Author: Serge Hallyn -* -* Check mqueuefs lifetime -* . parent creates /dev/mqueue2 -* . child mounts mqueue there -* . child does mq_open("/ab") -* . parent checks for /dev/mqueue2 -* . child exits -* . parent checks for /dev/mqueue2 -* . parent tries 'touch /dev/mqueue2/dd' -> should fail -* . parent umounts /dev/mqueue2 - -***************************************************************************/ - -#ifndef _GNU_SOURCE + * Copyright (c) International Business Machines Corp., 2009 + * Copyright (c) Serge Hallyn + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +/*\ + * [Description] + * + * Test mqueuefs manipulation from child/parent namespaces. + * + * [Algorithm] + * + * - parent creates mqueue folder in + * - child mounts mqueue there + * - child creates /MQ1 mqueue + * - parent checks for /mqueue/MQ1 existence + * - child exits + * - parent checks for /mqueue/MQ1 existence + * - parent tries 'touch /mqueue/MQ2' -> should fail + * - parent umount mqueuefs + */ #define _GNU_SOURCE -#endif -#include -#include -#include -#include + #include -#include -#include -#include -#include -#include "mqns.h" -#include "mqns_helper.h" +#include "common.h" +#include "tst_safe_stdio.h" -char *TCID = "posixmq_namespace_04"; -int TST_TOTAL = 1; +#define CHECK_MQ_OPEN_RET(x) ((x) >= 0 || ((x) == -1 && errno != EMFILE)) -int p1[2]; -int p2[2]; +#define MQNAME1 "/MQ1" +#define MQNAME2 "/MQ2" -#define FNAM1 DEV_MQUEUE2 SLASH_MQ1 -#define FNAM2 DEV_MQUEUE2 SLASH_MQ2 +static char *str_op; +static int use_clone; +static char *devdir; +static char *mqueue1; +static char *mqueue2; +static int *mq_freed; -int check_mqueue(void *vtest) +static int check_mqueue(LTP_ATTRIBUTE_UNUSED void *vtest) { - char buf[30]; mqd_t mqd; - int rc; - - (void) vtest; - close(p1[1]); - close(p2[0]); + mqd = TST_RETRY_FUNC( + mq_open(MQNAME1, O_RDWR | O_CREAT | O_EXCL, 0755, NULL), + CHECK_MQ_OPEN_RET); + if (mqd == -1) + tst_brk(TBROK | TERRNO, "mq_open failed"); - read(p1[0], buf, 3); /* go */ - - mqd = tst_syscall(__NR_mq_open, NOSLASH_MQ1, O_RDWR | O_CREAT | O_EXCL, - 0755, NULL); - if (mqd == -1) { - write(p2[1], "mqfail", 7); - tst_exit(); - } + SAFE_MQ_CLOSE(mqd); - mq_close(mqd); + SAFE_MOUNT("mqueue", devdir, "mqueue", 0, NULL); - rc = mount("mqueue", DEV_MQUEUE2, "mqueue", 0, NULL); - if (rc == -1) { - perror("mount"); - write(p2[1], "mount", 6); - tst_exit(); - } - - write(p2[1], "go", 3); - read(p1[0], buf, 3); - - tst_exit(); -} + TST_CHECKPOINT_WAKE_AND_WAIT(0); -static void setup(void) -{ - tst_require_root(); - check_mqns(); + return 0; } -int main(int argc, char *argv[]) +static void run(void) { int rc; int status; - char buf[30]; struct stat statbuf; - int use_clone = T_UNSHARE; - setup(); + tst_res(TINFO, "Checking mqueue filesystem lifetime"); - if (argc == 2 && strcmp(argv[1], "-clone") == 0) { - tst_resm(TINFO, - "Testing posix mq namespaces through clone(2)."); - use_clone = T_CLONE; - } else - tst_resm(TINFO, - "Testing posix mq namespaces through unshare(2)."); + clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL); - if (pipe(p1) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); - } - if (pipe(p2) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); - } + TST_CHECKPOINT_WAIT(0); - mkdir(DEV_MQUEUE2, 0755); + SAFE_STAT(mqueue1, &statbuf); + tst_res(TPASS, "%s child's mqueue can be accessed from parent", mqueue1); - tst_resm(TINFO, "Checking mqueue filesystem lifetime"); + TST_CHECKPOINT_WAKE(0); - /* fire off the test */ - rc = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_mqueue, NULL); - if (rc < 0) { - tst_resm(TFAIL, "failed clone/unshare"); - goto fail; - } + tst_res(TINFO, "Waiting child to exit"); - close(p1[0]); - close(p2[1]); - write(p1[1], "go", 3); - - read(p2[0], buf, 7); - if (!strcmp(buf, "mqfail")) { - tst_resm(TFAIL, "child process could not create mqueue"); - goto fail; - } else if (!strcmp(buf, "mount")) { - tst_resm(TFAIL, "child process could not mount mqueue"); - goto fail; - } + SAFE_WAIT(&status); - rc = stat(FNAM1, &statbuf); - if (rc == -1) { - perror("stat"); - write(p1[1], "go", 3); - tst_resm(TFAIL, "parent could not see child's created mq"); - goto fail; - } - write(p1[1], "go", 3); + if (!WIFEXITED(status)) + tst_brk(TBROK, "Child did not exit normally: %s", tst_strstatus(status)); - rc = wait(&status); - if (rc == -1) { - perror("wait"); - tst_resm(TFAIL, "error while parent waited on child to exit"); - goto fail; - } - if (!WIFEXITED(status)) { - tst_resm(TFAIL, "Child did not exit normally (status %d)", - status); - goto fail; - } - rc = stat(FNAM1, &statbuf); - if (rc == -1) { - tst_resm(TFAIL, - "parent's view of child's mq died with child"); - goto fail; - } + SAFE_STAT(mqueue1, &statbuf); + tst_res(TPASS, "%s child's mqueue can be accessed from parent after child's dead", mqueue1); - rc = creat(FNAM2, 0755); - if (rc != -1) { - tst_resm(TFAIL, - "parent was able to create a file in dead child's mqfs"); - goto fail; - } + rc = creat(mqueue2, 0755); + if (rc != -1) + tst_res(TFAIL, "Parent was able to create a file in dead child's mqueuefs"); + else + tst_res(TPASS, "Parent is not able to create a file in dead child's mqueuefs"); + + SAFE_UMOUNT(devdir); + + *mq_freed = 1; +} + +static void setup(void) +{ + char *tmpdir; + + use_clone = get_clone_unshare_enum(str_op); - tst_resm(TPASS, "Child mqueue fs still visible for parent"); + if (use_clone == T_NONE) + tst_brk(TBROK, "Plain process is not supported by this test"); -fail: - umount(DEV_MQUEUE2); - rmdir(DEV_MQUEUE2); + tmpdir = tst_get_tmpdir(); - tst_exit(); + SAFE_ASPRINTF(&devdir, "%s/mqueue", tmpdir); + SAFE_MKDIR(devdir, 0755); + + SAFE_ASPRINTF(&mqueue1, "%s" MQNAME1, devdir); + SAFE_ASPRINTF(&mqueue2, "%s" MQNAME2, devdir); + + mq_freed = SAFE_MMAP(NULL, + sizeof(int), + PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANONYMOUS, + -1, 0); +} + +static void cleanup(void) +{ + if (tst_is_mounted(devdir)) + SAFE_UMOUNT(devdir); + + if (!*mq_freed) { + SAFE_MQ_UNLINK(MQNAME1); + SAFE_MQ_UNLINK(MQNAME2); + } } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .needs_root = 1, + .forks_child = 1, + .needs_tmpdir = 1, + .needs_checkpoints = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +}; From patchwork Fri Jul 22 12:05:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1659526 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=PnUvM8CO; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lq7TZ4Fckz9sGV for ; Fri, 22 Jul 2022 22:06:58 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 081D93C9FE0 for ; Fri, 22 Jul 2022 14:06:56 +0200 (CEST) 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 7831C3C9FDC for ; Fri, 22 Jul 2022 14:05:38 +0200 (CEST) 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-5.smtp.seeweb.it (Postfix) with ESMTPS id 5FEF760020A for ; Fri, 22 Jul 2022 14:05:37 +0200 (CEST) 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 DFC7E348BC; Fri, 22 Jul 2022 12:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1658491536; 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=zoqEB9Ur/+4BQWmYueVHCM6+M13Byxi9CVKk5oZTlG8=; b=PnUvM8COll90SwAyOLaMVTKPMps7mJbjBoRX4mwACyeKzyCpDu1D8kp5gvRIDft0LiHR0H WF5C6qT8FhbS90Z95mOG9FPBzHaWPLgTkIPPxaYi/jS6w/KCs61PEkWEQqfNLWr+WQ0/// JvrR2YCcDUDS4R0bS1PjdWFu31Nyk+w= 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 78FBF134A9; Fri, 22 Jul 2022 12:05:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id IAK+GpCS2mJULwAAMHmgww (envelope-from ); Fri, 22 Jul 2022 12:05:36 +0000 To: ltp@lists.linux.it Date: Fri, 22 Jul 2022 14:05:00 +0200 Message-Id: <20220722120501.28670-7-andrea.cervesato@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722120501.28670-1-andrea.cervesato@suse.com> References: <20220722120501.28670-1-andrea.cervesato@suse.com> 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 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 v3 6/7] Delete deprecated mqns header files 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: , X-Patchwork-Original-From: Andrea Cervesato via ltp From: Andrea Cervesato Reply-To: Andrea Cervesato Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/mqns/Makefile | 27 ++------- testcases/kernel/containers/mqns/mqns.h | 11 ---- .../kernel/containers/mqns/mqns_helper.h | 56 ------------------- 3 files changed, 5 insertions(+), 89 deletions(-) delete mode 100644 testcases/kernel/containers/mqns/mqns.h delete mode 100644 testcases/kernel/containers/mqns/mqns_helper.h diff --git a/testcases/kernel/containers/mqns/Makefile b/testcases/kernel/containers/mqns/Makefile index 64c3763ee..eb0f97c2b 100644 --- a/testcases/kernel/containers/mqns/Makefile +++ b/testcases/kernel/containers/mqns/Makefile @@ -1,29 +1,12 @@ -################################################################################ -## ## -## Copyright (c) International Business Machines Corp., 2009 ## -## Copyright (c) Nadia Derbey, 2009 ## -## ## -## This program is free software; you can redistribute it and#or modify ## -## it under the terms of the GNU General Public License as published by ## -## the Free Software Foundation; either version 2 of the License, or ## -## (at your option) any later version. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## -## for more details. ## -## ## -## You should have received a copy of the GNU General Public License ## -## along with this program; if not, write to the Free Software ## -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -################################################################################ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) International Business Machines Corp., 2009 +# Copyright (c) Nadia Derbey, 2009 +# Copyright (C) 2021 SUSE LLC Andrea Cervesato top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc -LDLIBS := -lpthread -lrt -lclone $(LDLIBS) +LDLIBS := -lpthread -lrt $(LDLIBS) include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/containers/mqns/mqns.h b/testcases/kernel/containers/mqns/mqns.h deleted file mode 100644 index 5a9056838..000000000 --- a/testcases/kernel/containers/mqns/mqns.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __MQNS_H -#define __MQNS_H - -#define DEV_MQUEUE "/dev/mqueue" -#define DEV_MQUEUE2 "/dev/mqueue2" -#define SLASH_MQ1 "/MQ1" -#define NOSLASH_MQ1 "MQ1" -#define SLASH_MQ2 "/MQ2" -#define NOSLASH_MQ2 "MQ2" - -#endif /* __MQNS_H */ diff --git a/testcases/kernel/containers/mqns/mqns_helper.h b/testcases/kernel/containers/mqns/mqns_helper.h deleted file mode 100644 index 605378d48..000000000 --- a/testcases/kernel/containers/mqns/mqns_helper.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) International Business Machines Corp., 2009 - * Copyright (c) Nadia Derbey, 2009 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Author: Serge Hallyn - ***************************************************************************/ -#include -#include -#include -#include -#include "../libclone/libclone.h" -#include "lapi/syscalls.h" -#include "safe_macros.h" -#include "test.h" - -static int dummy_child(void *v) -{ - (void) v; - return 0; -} - -static void check_mqns(void) -{ - int pid, status; - mqd_t mqd; - - if (tst_kvercmp(2, 6, 30) < 0) - tst_brkm(TCONF, NULL, "Kernel version is lower than expected"); - - mq_unlink("/checkmqnsenabled"); - mqd = - mq_open("/checkmqnsenabled", O_RDWR | O_CREAT | O_EXCL, 0777, NULL); - if (mqd == -1) - tst_brkm(TCONF, NULL, "mq_open check failed"); - - mq_close(mqd); - mq_unlink("/checkmqnsenabled"); - - pid = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, dummy_child, NULL); - if (pid == -1) - tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWIPC not supported"); - - SAFE_WAIT(NULL, &status); -} From patchwork Fri Jul 22 12:05:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1659524 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.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=inM6Zsl+; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lq7T908pdz9sGV for ; Fri, 22 Jul 2022 22:06:36 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id DB58F3C9F90 for ; Fri, 22 Jul 2022 14:06:34 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 5A3C83C9F80 for ; Fri, 22 Jul 2022 14:05:38 +0200 (CEST) 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-7.smtp.seeweb.it (Postfix) with ESMTPS id D52CE200B7B for ; Fri, 22 Jul 2022 14:05:37 +0200 (CEST) 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 8218E348BE; Fri, 22 Jul 2022 12:05:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1658491537; 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=MkgjROSg6sXfpjD0lPnV4Zg1oz6x7GkezZWCOLJMw4c=; b=inM6Zsl+vDqbvpsteFvGjuY2T5K++OXO1SwUdG+fx8Qp/D2hpP3MRlf9B744bIRqVh5qTA HuXoKldWoGacYeYzwbz8ajWqySQqCA4u3MBR7XVh62k35wZmdWFbn+HLAnCpeSRFqLH9nA PKb0+VytMshuEa5oOvaNKespu7qiEzs= 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 17370134A9; Fri, 22 Jul 2022 12:05:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uOpYO5CS2mJULwAAMHmgww (envelope-from ); Fri, 22 Jul 2022 12:05:36 +0000 To: ltp@lists.linux.it Date: Fri, 22 Jul 2022 14:05:01 +0200 Message-Id: <20220722120501.28670-8-andrea.cervesato@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722120501.28670-1-andrea.cervesato@suse.com> References: <20220722120501.28670-1-andrea.cervesato@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-7.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 autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v3 7/7] Rename common.h into mqns.h for mqns suite 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: , X-Patchwork-Original-From: Andrea Cervesato via ltp From: Andrea Cervesato Reply-To: Andrea Cervesato Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato Reviewed-by: Petr Vorel --- testcases/kernel/containers/mqns/{common.h => mqns.h} | 0 testcases/kernel/containers/mqns/mqns_01.c | 2 +- testcases/kernel/containers/mqns/mqns_02.c | 2 +- testcases/kernel/containers/mqns/mqns_03.c | 2 +- testcases/kernel/containers/mqns/mqns_04.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename testcases/kernel/containers/mqns/{common.h => mqns.h} (100%) diff --git a/testcases/kernel/containers/mqns/common.h b/testcases/kernel/containers/mqns/mqns.h similarity index 100% rename from testcases/kernel/containers/mqns/common.h rename to testcases/kernel/containers/mqns/mqns.h diff --git a/testcases/kernel/containers/mqns/mqns_01.c b/testcases/kernel/containers/mqns/mqns_01.c index a34dc4f66..7e62ab3d6 100644 --- a/testcases/kernel/containers/mqns/mqns_01.c +++ b/testcases/kernel/containers/mqns/mqns_01.c @@ -12,7 +12,7 @@ * the isolated/forked child namespace. */ -#include "common.h" +#include "mqns.h" #define MQNAME "/MQ1" diff --git a/testcases/kernel/containers/mqns/mqns_02.c b/testcases/kernel/containers/mqns/mqns_02.c index 4383fef73..59d483be7 100644 --- a/testcases/kernel/containers/mqns/mqns_02.c +++ b/testcases/kernel/containers/mqns/mqns_02.c @@ -12,7 +12,7 @@ * then check namespace isolation. */ -#include "common.h" +#include "mqns.h" #define MQNAME "/MQ1" diff --git a/testcases/kernel/containers/mqns/mqns_03.c b/testcases/kernel/containers/mqns/mqns_03.c index 5914a2a9b..54ba54304 100644 --- a/testcases/kernel/containers/mqns/mqns_03.c +++ b/testcases/kernel/containers/mqns/mqns_03.c @@ -25,7 +25,7 @@ #define _GNU_SOURCE #include -#include "common.h" +#include "mqns.h" #include "tst_safe_stdio.h" #define MQNAME1 "/MQ1" diff --git a/testcases/kernel/containers/mqns/mqns_04.c b/testcases/kernel/containers/mqns/mqns_04.c index 95ff18ef2..b3f538592 100644 --- a/testcases/kernel/containers/mqns/mqns_04.c +++ b/testcases/kernel/containers/mqns/mqns_04.c @@ -24,7 +24,7 @@ #define _GNU_SOURCE #include -#include "common.h" +#include "mqns.h" #include "tst_safe_stdio.h" #define CHECK_MQ_OPEN_RET(x) ((x) >= 0 || ((x) == -1 && errno != EMFILE))