kuYZiW6tlrngGBbLzzPbEQ+cBWyWImI ixJ0ZhLDnLo2UaRL6upW0EMJOSO7a94bZpObrlQuhXRsJPNg9yBCqoozczn4OfIBul/Ymq iGzw1ByUEFd/0vFsKLGVfredWMB07CRCg9fvrp/+TCTCcoUmK7LofctpvhdTFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751293290; 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=U0/HzoZMhXPphqZNiWnbAs+XoQQ3pEyQPE7If7VFGAw=; b=rVTfFPiWY+YdnsMY3RrLva7knTU0xGMZYcarS/VsumuWT4jdhKIofZADqHfp6aMwqgVcuk yf1Ft9Y3NHaB4sNXh/+NpSCPwuM6toZlam8LLgfoFZ3FwyocvFUIaqtz/JHvXa+bIq3du0 4We5LfVLg4R+YdsVWFTBz/N/1b6/VSI8amxDdSQDT3bLc7A8XvmqPkF0r6XGmEuTLBIqiI SuVMC0fFIN6BwkVjTFOnCjaQyzgd0rybWRqU0AIBRXJ72ApFylgQ6LH/KxMaAsYVU9PziW NPTY7nCIQiVH9RSwKliZz4/VArFIKCIBbXtUr+I0743gngz9iOTX1gKFNCoHDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751293290; a=rsa-sha256; cv=none; b=FLz7ha7ZUwaTT6u/RIcOhGLDLOQXJ1vrtX3UG6x9v5la3KoVQFxd7cpjeDqzifeb85xTdT F4yezO6e3EXp5MjNaMKgpljJDgDv6STL2W5556nbxSR2NHk1Nal6xOvHQIiQ/CFZruYfp4 1YCI3TKi1zF4oWBXx4atsV+SaaYyaoS7uEttN29jqGXzKThQmRfSpVaxMZiiPf6dl/Ex7V QT8ZpuxqazjCTqXWc7auRmIHg46Xjol7jWOJ6MrYfs/0V+YabdfuHMn515JBL7OxMxjAHZ CojGvLzHDU1DDvvNvOEZ9ner1OhdxncZTQQOHAnLyk3D4D1UwcChUwAUsWXgEA== 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 4bW7d55Tmhz175j; Mon, 30 Jun 2025 14:21:29 +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 55UELTS4076220; Mon, 30 Jun 2025 14:21:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55UELTF3076217; Mon, 30 Jun 2025 14:21:29 GMT (envelope-from git) Date: Mon, 30 Jun 2025 14:21:29 GMT Message-Id: <202506301421.55UELTF3076217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f56b66f1260a - stable/14 - tests: Add a regression test for commit 7587f6d4840f8 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f56b66f1260a33e49c65bbc05213ec8267978a93 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f56b66f1260a33e49c65bbc05213ec8267978a93 commit f56b66f1260a33e49c65bbc05213ec8267978a93 Author: Mark Johnston AuthorDate: 2025-05-28 15:28:36 +0000 Commit: Mark Johnston CommitDate: 2025-06-30 14:19:30 +0000 tests: Add a regression test for commit 7587f6d4840f8 Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50533 (cherry picked from commit a5dac34f6e98c47bd7cb1946e39cc45432e167a8) --- tests/sys/kern/Makefile | 2 + tests/sys/kern/jail_lookup_root.c | 171 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 46977bedef98..89c993a39dc7 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -19,6 +19,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 @@ -71,6 +72,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..609f86ac4c66 --- /dev/null +++ b/tests/sys/kern/jail_lookup_root.c @@ -0,0 +1,171 @@ +/*- + * 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 +build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val, + size_t len) +{ + int i; + + if (*iovlen < 0) + return; + i = *iovlen; + *iov = realloc(*iov, sizeof **iov * (i + 2)); + if (*iov == NULL) { + *iovlen = -1; + return; + } + (*iov)[i].iov_base = strdup(name); + (*iov)[i].iov_len = strlen(name) + 1; + i++; + (*iov)[i].iov_base = val; + if (len == (size_t)-1) { + if (val != NULL) + len = strlen(val) + 1; + else + len = 0; + } + (*iov)[i].iov_len = (int)len; + *iovlen = ++i; +} + +static void +free_iovec(struct iovec **iov, int *iovlen) +{ + int i; + + for (i = 0; i < *iovlen; i += 2) + free((*iov)[i].iov_base); + free(*iov); +} + +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()); +}