From patchwork Mon Mar 4 18:04:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Lawrence X-Patchwork-Id: 1051238 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="bKJIVGUu"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Cnwg1ZF1z9s47 for ; Tue, 5 Mar 2019 05:04:32 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 543703EAAF5 for ; Mon, 4 Mar 2019 19:04:27 +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 [IPv6:2001:4b78:1:20::5]) by picard.linux.it (Postfix) with ESMTP id 5302B3EA410 for ; Mon, 4 Mar 2019 19:04:25 +0100 (CET) Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id B9FE0600871 for ; Mon, 4 Mar 2019 19:04:25 +0100 (CET) Received: by mail-pg1-x549.google.com with SMTP id h68so5619235pgc.3 for ; Mon, 04 Mar 2019 10:04:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=Evb7KkIftgvL1Ghjd3yQqWXmT2NjKTc6mvKgd/xoG20=; b=bKJIVGUuNZ+szPH3FO81yLu9UGLq/XzpyGRcC8spVqVDHviPilkDLMJ5a17yMdz32I XBCYGjL3iVXfoYYFLKip+finKfpw+K0RIBFUidm7jIUgyfQ1bZFmjoeio+QfANlrmN1o mjLQ0QwJi/g731A0itPWwnP+ef8IsU8XOU/UtvTZ0oJUe3uixAfLy4sfRchOqWAgi1aP +fVynNIlVwdJt88JCeAYwQKknElSpO+3dZuJkkUVYFEvV23Av1PzWu84J60RkyvMHYgN RGdc6xY/h/CeX7kfGQZkAhPDx7ktC5ajKiTcfclPBz9SprCJRcuGtzmQkR1zJ7ybTher WSvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=Evb7KkIftgvL1Ghjd3yQqWXmT2NjKTc6mvKgd/xoG20=; b=LkEPrIplWSyuaEfHRnymzPbpIkU+oI6nTL4JZd0kxhEFn+7usCXcGqAZbPTuRjOfMC VTCVwVyTco3eogseog5yatGy2jFhtYx0eq9cdVQndxUUkwVGQgx3dGrSrbrLV4dsbYkx /KBXdMrM6vGVI6lkcWaN0gQOF/YM4hX9r4cdn4AJLjEVZpuKph6WNwjAJ4U57Be5/ioJ 6nDPTbzk0jGpnQFPdE4coVXp4TAd81gXg5b6847+zwsdM4CMiLCZ3QdYDhMyAX1TYQTc DW/Bq3Pu+9g3bBG3yk6CkM58iHPmBHbPjLPK5PAgD+764LvLwn6TXFP6PcZh07nvnhm1 TdSA== X-Gm-Message-State: APjAAAXDGuTS/k7eTZuxaOv/2W0+SCat+5egGCg0fFAqc2RYAKpzz3FM r2R/Fs/976utqPkBmBp/9zzxYqtTaQlXx+jFJxjUINtNhdrw8QmejC7fjnRK9h5Dc9UuZ4IOjwE WVP3iYz1z7lHZjhfi9auJPf8Uu8V2Q2L+13n1ef0ucoETqjtQh0XXit6BeZSBD3Q+5LhMhf9E X-Google-Smtp-Source: APXvYqwyvK/wF3XtWZp5/K+2BX+CaRUsbwC9r8DsN/1yLB2BzC4QuyRzkcc9b4iEcTDWIOxpeaEOJIE+7jXTcfvAHKA= X-Received: by 2002:a17:902:9f97:: with SMTP id g23mr1369454plq.66.1551722662324; Mon, 04 Mar 2019 10:04:22 -0800 (PST) Date: Mon, 4 Mar 2019 10:04:06 -0800 Message-Id: <20190304180406.65987-1-paullawrence@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.352.gf09ad66450-goog From: Paul Lawrence To: ltp@lists.linux.it, kernel-team@android.com, maennich@google.com, chrubis@suse.cz X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-7.4 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v3] Add ltp pivot_root test X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 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" Use HAVE_LIBCAP to not break compiles on machines without libcap Moved constants Defined test array Changd to use /* ... */ Added to runtest/syscalls Signed-off-by: Paul Lawrence Reviewed-by: Matthias Maennich --- runtest/syscalls | 2 + testcases/kernel/syscalls/pivot_root/Makefile | 11 + .../kernel/syscalls/pivot_root/pivot_root01.c | 200 ++++++++++++++++++ 3 files changed, 213 insertions(+) create mode 100644 testcases/kernel/syscalls/pivot_root/Makefile create mode 100644 testcases/kernel/syscalls/pivot_root/pivot_root01.c diff --git a/runtest/syscalls b/runtest/syscalls index 668c87cd1..debda74b8 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -835,6 +835,8 @@ pipe11 pipe11 pipe2_01 pipe2_01 pipe2_02 pipe2_02 +pivot_root01 pivot_root01 + poll01 poll01 poll02 poll02 diff --git a/testcases/kernel/syscalls/pivot_root/Makefile b/testcases/kernel/syscalls/pivot_root/Makefile new file mode 100644 index 000000000..a16974d41 --- /dev/null +++ b/testcases/kernel/syscalls/pivot_root/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Copyright (c) 2019 Google, Inc. + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +LDLIBS := $(LDLIBS) $(CAP_LIBS) + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/pivot_root/pivot_root01.c b/testcases/kernel/syscalls/pivot_root/pivot_root01.c new file mode 100644 index 000000000..a23439250 --- /dev/null +++ b/testcases/kernel/syscalls/pivot_root/pivot_root01.c @@ -0,0 +1,200 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * + * Copyright (c) 2019 Google, Inc. + */ + +#define _GNU_SOURCE + +#include + +#include +#include +#include + +#include +#include + +#include "tst_test.h" + +#ifdef HAVE_LIBCAP +#include +#endif + +static const char* chroot_dir = "chroot"; +static const char* new_root = "/new_root"; +static const char* put_old = "/new_root/put_old"; +static const char* put_old_fs = "/put_old_fs"; +static const char* put_old_bad = "/put_old_fs/put_old"; + +/* + * Test consists of a series of steps that allow pivot_root to succeed, which is + * run when param is NORMAL. All other values tweak one of the steps to induce + * a failure, and check the errno is as expected. + */ +#define NORMAL 0 + +/* + * EBUSY + * new_root or put_old are on the current root file system + */ +#define NEW_ROOT_ON_CURRENT_ROOT 1 + +/* + * EINVAL + * put_old is not underneath new_root + * Note: if put_old and new_root are on the same fs, + * pivot_root fails with EBUSY before testing reachability + */ +#define PUT_OLD_NOT_UNDERNEATH_NEW_ROOT 2 + +/* + * ENOTDIR + * new_root or put_old is not a directory + */ +#define PUT_OLD_NOT_DIR 3 + +/* + * EPERM + * The calling process does not have the CAP_SYS_ADMIN capability. + */ +#define NO_CAP_SYS_ADMIN 4 + +static struct test_case { + int test_case; + int expected_error; +} test_cases[] = { + {NORMAL, 0}, + {NEW_ROOT_ON_CURRENT_ROOT, EBUSY}, + {PUT_OLD_NOT_UNDERNEATH_NEW_ROOT, EINVAL}, + {PUT_OLD_NOT_DIR, ENOTDIR}, +#ifdef HAVE_LIBCAP + {NO_CAP_SYS_ADMIN, EPERM}, +#endif +}; + + +#ifdef HAVE_LIBCAP +static void drop_cap_sys_admin(void) +{ + cap_value_t cap_value[] = { CAP_SYS_ADMIN }; + cap_t cap = cap_get_proc(); + if (!cap) + tst_brk(TFAIL | TERRNO, "cap_get_proc failed"); + + if (cap_set_flag(cap, CAP_EFFECTIVE, 1, cap_value, CAP_CLEAR)) + tst_brk(TFAIL | TERRNO, "cap_set_flag failed"); + + if (cap_set_proc(cap)) + tst_brk(TFAIL | TERRNO, "cap_set_proc failed"); +} +#endif + +#ifdef HAVE_UNSHARE +static void run(unsigned int test_case) +{ + /* Work in child process - needed to undo unshare and chroot */ + if (SAFE_FORK()) { + tst_reap_children(); + return; + } + + /* pivot_root requires no shared mounts exist in process namespace */ + TEST(unshare(CLONE_NEWNS | CLONE_FS)); + if (TST_RET == -1) + tst_brk(TFAIL | TERRNO, "unshare failed"); + + /* + * Create an initial root dir. pivot_root doesn't work if the initial root + * dir is a initramfs, so use chroot to create a safe environment + */ + SAFE_MOUNT("none", "/", NULL, MS_REC|MS_PRIVATE, NULL); + SAFE_MOUNT("none", chroot_dir, "tmpfs", 0, 0); + SAFE_CHROOT(chroot_dir); + + /* Create our new root location */ + SAFE_MKDIR(new_root, 0777); + + /* + * pivot_root only works if new_root is a mount point, so mount a tmpfs + * unless testing for that fail mode + */ + if (test_cases[test_case].test_case != NEW_ROOT_ON_CURRENT_ROOT) + SAFE_MOUNT("none", new_root, "tmpfs", 0, 0); + + /* + * Create put_old under new_root, unless testing for that specific fail + * mode + */ + const char* actual_put_old = NULL; + if (test_cases[test_case].test_case == PUT_OLD_NOT_UNDERNEATH_NEW_ROOT) { + actual_put_old = put_old_bad; + SAFE_MKDIR(put_old_fs, 0777); + SAFE_MOUNT("none", put_old_fs, "tmpfs", 0, 0); + SAFE_MKDIR(put_old_bad, 0777); + } else { + actual_put_old = put_old; + + /* put_old must be a directory for success */ + if (test_cases[test_case].test_case == PUT_OLD_NOT_DIR) + SAFE_CREAT(put_old, 0777); + else + SAFE_MKDIR(put_old, 0777); + } + +#ifdef HAVE_LIBCAP + if (test_cases[test_case].test_case == NO_CAP_SYS_ADMIN) + drop_cap_sys_admin(); +#endif + + /* Test the syscall */ + TEST(syscall(__NR_pivot_root, new_root, actual_put_old)); + + /* If NORMAL it should have succeeded */ + if (test_cases[test_case].test_case == NORMAL) { + if (TST_RET) { + tst_res(TFAIL | TERRNO, "pivot_root failed"); + exit(TBROK); + } else { + tst_res(TPASS, "pivot_root succeeded"); + exit(TPASS); + } + } + + /* pivot_root is expected to fail */ + if (TST_RET == 0) { + tst_res(TFAIL, "pivot_root succeeded unexpectedly"); + exit(TBROK); + } + + /* Check error code is correct */ + if (errno != test_cases[test_case].expected_error) { + tst_res(TFAIL | TERRNO, "pivot_root failed with wrong errno"); + exit(TBROK); + } + + tst_res(TPASS, "pivot_root failed as expected with %s", + strerror(errno)); + exit(TPASS); +} + +#else +static void run(void) +{ + tst_brk(TCONF, NULL, "unshare is undefined."); +} +#endif + +static void setup(void) +{ + SAFE_MKDIR(chroot_dir, 0777); +} + +static struct tst_test test = { + .test = run, + .tcnt = ARRAY_SIZE(test_cases), + .needs_tmpdir = 1, + .needs_root = 1, + .forks_child = 1, + .setup = setup, +};