From patchwork Fri Jan 10 10:21:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xu X-Patchwork-Id: 1220918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com 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 ozlabs.org (Postfix) with ESMTPS id 47vJvC65Y0z9sRK for ; Fri, 10 Jan 2020 21:22:15 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 1CF9A3C2543 for ; Fri, 10 Jan 2020 11:22:13 +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]) by picard.linux.it (Postfix) with ESMTP id 54D613C2531 for ; Fri, 10 Jan 2020 11:22:06 +0100 (CET) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-3.smtp.seeweb.it (Postfix) with ESMTP id 52B131A01741 for ; Fri, 10 Jan 2020 11:22:04 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.69,415,1571673600"; d="scan'208";a="81617814" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Jan 2020 18:22:04 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id EC0EB4CE1646; Fri, 10 Jan 2020 18:13:00 +0800 (CST) Received: from G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.83) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 10 Jan 2020 18:22:03 +0800 Received: from localhost.localdomain (10.167.220.84) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 10 Jan 2020 18:22:03 +0800 From: Yang Xu To: Date: Fri, 10 Jan 2020 18:21:42 +0800 Message-ID: <1578651702-19486-3-git-send-email-xuyang2018.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578651702-19486-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> References: <20200109124101.GE31981@rei.lan> <1578651702-19486-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-yoursite-MailScanner-ID: EC0EB4CE1646.AE732 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xuyang2018.jy@cn.fujitsu.com X-Spam-Status: No, score=0.3 required=7.0 tests=KHOP_HELO_FCRDNS, SPF_HELO_NONE, SPF_NONE autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-3.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-3.smtp.seeweb.it Subject: [LTP] [PATCH v2 3/3] syscalls/capset04: add new EPERM error test with vfs cap support 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: , Cc: ltp@lists.linux.it Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Now, most linux distributions has VFS capabilities supports, so modifying other process cap is never permitted. This case from old capset02.c. Signed-off-by: Yang Xu --- runtest/syscalls | 1 + testcases/kernel/syscalls/capset/.gitignore | 1 + testcases/kernel/syscalls/capset/capset04.c | 81 +++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 testcases/kernel/syscalls/capset/capset04.c diff --git a/runtest/syscalls b/runtest/syscalls index 4f481be6d..f58fefe17 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -45,6 +45,7 @@ capget02 capget02 capset01 capset01 capset02 capset02 capset03 capset03 +capset04 capset04 cacheflush01 cacheflush01 diff --git a/testcases/kernel/syscalls/capset/.gitignore b/testcases/kernel/syscalls/capset/.gitignore index 3f9a4d5e8..d0a7a13a4 100644 --- a/testcases/kernel/syscalls/capset/.gitignore +++ b/testcases/kernel/syscalls/capset/.gitignore @@ -1,3 +1,4 @@ /capset01 /capset02 /capset03 +/capset04 diff --git a/testcases/kernel/syscalls/capset/capset04.c b/testcases/kernel/syscalls/capset/capset04.c new file mode 100644 index 000000000..895b62e17 --- /dev/null +++ b/testcases/kernel/syscalls/capset/capset04.c @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved. + * Author: Saji Kumar.V.R + * + * Tests whether we can use capset() to modify the capabilities of a thread + * other than itself. Now, most linux distributions with kernel supporting + * VFS capabilities, this should be never permitted. + */ +#include +#include +#include +#include "tst_test.h" +#include "lapi/syscalls.h" +#include + +static struct __user_cap_header_struct *header; +static struct __user_cap_data_struct *data; +static pid_t child_pid; +static int clean_nflag; +static void cleanup(void); + +static void child_func(void) +{ + for (;;) + sleep(10); +} + +static void verify_capset(void) +{ + child_pid = SAFE_FORK(); + if (child_pid == 0) { + child_func(); + exit(0); + } + + clean_nflag = 0; + header->pid = child_pid; + + TEST(tst_syscall(__NR_capset, header, data)); + if (TST_RET == 0) { + tst_res(TFAIL, "capset succeed unexpectedly"); + cleanup(); + return; + } + if (TST_ERR == EPERM) + tst_res(TPASS, "capset doesn't can modify other process capabilities"); + else + tst_res(TFAIL | TTERRNO, "capset expected EPERM, bug got"); + + cleanup(); +} + +static void setup(void) +{ + header->version = 0x20080522; + TEST(tst_syscall(__NR_capget, header, data)); + if (TST_RET == -1) + tst_brk(TBROK | TTERRNO, "capget data failed"); +} + +static void cleanup(void) +{ + if (child_pid > 0 && !clean_nflag) { + SAFE_KILL(child_pid, SIGTERM); + SAFE_WAIT(NULL); + clean_nflag = 1; + } +} + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .test_all = verify_capset, + .forks_child = 1, + .bufs = (struct tst_buffers []) { + {&header, .size = sizeof(*header)}, + {&data, .size = 2 * sizeof(*data)}, + {}, + } +};