From nobody Wed May 28 15:42:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6tzv5CvJz5wvDy; Wed, 28 May 2025 15:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6tzv2BqMz4L5m; Wed, 28 May 2025 15:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lVbxHlXwN3xghCXuVLWQqUSB4FyLmbfKM0wacVS6exE=; b=aX/zEPZiU4xSNwE28P1cVwqWUkSJNN7Oj+flUQpWYtKKHV4xXbjFsomLTDICv/gYWCjnOA kJjW02SV9bgMRzigVjF1WXMAiREeFwNM1EDkJXkd6Gs9vYOrAMbI4O0Q3immIg03AAfLq9 eDA2O599WPfwVBMabHQyha14AzQ39MNxm2zqfpKd6ZVTfEOAJj+yl3oXVvnkENrZ76a8Jf Ok63mL4AbW1JE8U5G2w9CQ7kWvw34HU3K51NGWGE2jYViGRm0dwdOzFRNML+hpNob3rRFF qdTFy2U8VvKk52xg5nEcM7hU//IXxaiMn2EARL/lKqpK0M7FeXtipyHYbwBL/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748446955; a=rsa-sha256; cv=none; b=S/hSuhvXMIiykQGdKTUtQ45how7Uf6VsJoPQtEearO5elNJcMso4ZdFrOTAasaVgV7O+g6 aPp4ElGkJY4dBpitjk/Ey1xjQ8155bxQO4NKIyfBrampjfAlBRaCo/gkr5elk9lsANtUsu uuhpgIDadWMJxMpNhLL+tloQxtFUQJSs2LRmKPYQDHgeW7XO/c3QZFzZ1mxTAkzXpKR9DB E7NVb6tdGrNJs0r761baqxYQeik8W5I0/D/qie6ual2c+sioUCHTTV2wGB+LLvAcRHJfvt UNk2jaXsq5YG9lpucfWDx+g8RBGIT5fA5upFWhfkfcd6RctvKJuTNCIZCeR/Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lVbxHlXwN3xghCXuVLWQqUSB4FyLmbfKM0wacVS6exE=; b=Q6P0Ay4TcIbNMutL5B/T/qjR3CQCZxQFHCWLce11sZzuUGv92QzCGph35Qc/5OTS61y90i 68pFmGbZ/r9LKPf5u+OUtg7P8P9sdHE8OFaL4twceBdlDYs/NhWs+/ccX3tepZ7UMDfFl1 qO5rkCjcDHhWGKpwSPPo6+FlkuGuPBfsRHWTFG8B/ScXjsGak1w3MhaQkb1CrF2+XyR/hC EuzNOkQu7jnLjPqI6nXd9SU8qiSdV478MgO9abK8Klt7QWj6zEbRs6UWxG+2q3+JjwWpjc qE0lv/jt7twwvPEqoiJqxSFdAs7aChVDlrUieLIA2ZeTeDpKvls8v5NF/d13kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6tzv1d27zkCj; Wed, 28 May 2025 15:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54SFgZRG060474; Wed, 28 May 2025 15:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SFgZDl060471; Wed, 28 May 2025 15:42:35 GMT (envelope-from git) Date: Wed, 28 May 2025 15:42:35 GMT Message-Id: <202505281542.54SFgZDl060471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a5dac34f6e98 - main - tests: Add a regression test for commit 7587f6d4840f8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5dac34f6e98c47bd7cb1946e39cc45432e167a8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a5dac34f6e98c47bd7cb1946e39cc45432e167a8 commit a5dac34f6e98c47bd7cb1946e39cc45432e167a8 Author: Mark Johnston AuthorDate: 2025-05-28 15:28:36 +0000 Commit: Mark Johnston CommitDate: 2025-05-28 15:41:53 +0000 tests: Add a regression test for commit 7587f6d4840f8 Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50533 --- tests/sys/kern/Makefile | 2 + tests/sys/kern/jail_lookup_root.c | 133 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 9480ea78266f..94a75048a31a 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -18,6 +18,7 @@ ATF_TESTS_C+= kern_descrip_test # One test modifies the maxfiles limit, which can cause spurious test failures. TEST_METADATA.kern_descrip_test+= is_exclusive="true" ATF_TESTS_C+= fdgrowtable_test +ATF_TESTS_C+= jail_lookup_root ATF_TESTS_C+= kill_zombie .if ${MK_OPENSSL} != "no" ATF_TESTS_C+= ktls_test @@ -77,6 +78,7 @@ PROGS+= coredump_phnum_helper PROGS+= pdeathsig_helper PROGS+= sendfile_helper +LIBADD.jail_lookup_root+= jail util CFLAGS.sys_getrandom+= -I${SRCTOP}/sys/contrib/zstd/lib LIBADD.sys_getrandom+= zstd LIBADD.sys_getrandom+= c diff --git a/tests/sys/kern/jail_lookup_root.c b/tests/sys/kern/jail_lookup_root.c new file mode 100644 index 000000000000..34e89f4aea2b --- /dev/null +++ b/tests/sys/kern/jail_lookup_root.c @@ -0,0 +1,133 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Mark Johnston + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +static void +mkdir_checked(const char *dir, mode_t mode) +{ + int error; + + error = mkdir(dir, mode); + ATF_REQUIRE_MSG(error == 0 || errno == EEXIST, + "mkdir %s: %s", dir, strerror(errno)); +} + +static void __unused +mount_nullfs(const char *dir, const char *target) +{ + struct iovec *iov; + char errmsg[1024]; + int error, iovlen; + + iov = NULL; + iovlen = 0; + + build_iovec(&iov, &iovlen, __DECONST(char *, "fstype"), + __DECONST(char *, "nullfs"), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "fspath"), + __DECONST(char *, target), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "from"), + __DECONST(char *, dir), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "errmsg"), + errmsg, sizeof(errmsg)); + + errmsg[0] = '\0'; + error = nmount(iov, iovlen, 0); + ATF_REQUIRE_MSG(error == 0, "nmount: %s", + errmsg[0] != '\0' ? errmsg : strerror(errno)); + + free_iovec(&iov, &iovlen); +} + +ATF_TC_WITH_CLEANUP(jail_root); +ATF_TC_HEAD(jail_root, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(jail_root, tc) +{ + int error, fd, jid; + + mkdir_checked("./root", 0755); + mkdir_checked("./root/a", 0755); + mkdir_checked("./root/b", 0755); + mkdir_checked("./root/a/c", 0755); + + jid = jail_setv(JAIL_CREATE | JAIL_ATTACH, + "name", "nullfs_jail_root_test", + "allow.mount", "true", + "allow.mount.nullfs", "true", + "enforce_statfs", "1", + "path", "./root", + "persist", NULL, + NULL); + ATF_REQUIRE_MSG(jid >= 0, "jail_setv: %s", jail_errmsg); + + mount_nullfs("/a", "/b"); + + error = chdir("/b/c"); + ATF_REQUIRE(error == 0); + + error = rename("/a/c", "/c"); + ATF_REQUIRE(error == 0); + + /* Descending to the jail root should be ok. */ + error = chdir(".."); + ATF_REQUIRE(error == 0); + + /* Going beyond the root will trigger an error. */ + error = chdir(".."); + ATF_REQUIRE_ERRNO(ENOENT, error != 0); + fd = open("..", O_RDONLY | O_DIRECTORY); + ATF_REQUIRE_ERRNO(ENOENT, fd < 0); +} +ATF_TC_CLEANUP(jail_root, tc) +{ + struct statfs fs; + fsid_t fsid; + int error, jid; + + error = statfs("./root/b", &fs); + if (error != 0) + err(1, "statfs ./b"); + fsid = fs.f_fsid; + error = statfs("./root", &fs); + if (error != 0) + err(1, "statfs ./root"); + if (fsid.val[0] != fs.f_fsid.val[0] || + fsid.val[1] != fs.f_fsid.val[1]) { + error = unmount("./root/b", 0); + if (error != 0) + err(1, "unmount ./root/b"); + } + + jid = jail_getid("nullfs_jail_root_test"); + if (jid >= 0) { + error = jail_remove(jid); + if (error != 0) + err(1, "jail_remove"); + } +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, jail_root); + return (atf_no_error()); +}