From nobody Fri Nov 21 15:19:25 2025 X-Original-To: dev-commits-src-all@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 4dCf5T6Ptnz6HLb3 for ; Fri, 21 Nov 2025 15:19:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5T4887z3nnY for ; Fri, 21 Nov 2025 15:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738365; 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=+yNfA41xPw+RvnMX9IC1To+6iKfSRP4m55aXNATs4kQ=; b=kTNu0H6sRaHnktkfxxIUsm2uTiLGbcO9xrbPcXwLAhioGfV0FGo15vTXYy9KwPxTYI5yHI ItuMdKsoLH8wdOwF+HwNJEer3K8tJFpCG9ftnZoZ/HuJWVySXTlBU3bBKZsdpTvDYOPC80 Fyve5mGfbUqSedwyBhV7L4v9Vg5F5HBQ7+CoM/flPa7yXdpkk4l7LTVojvxG2EZnnR9RLU dcpLo8/MBsO89S1yImxtO/dtBn++vZ7Kfz/IlRMik6wihYZH1Qqzo8q6lp/5WH7wUk/nx2 vkb51JPVuSuTpH7eeasxHOTgDDMunCw8WfGQK3cL28PtMjsdgNw9V5eD+2ioRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738365; 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=+yNfA41xPw+RvnMX9IC1To+6iKfSRP4m55aXNATs4kQ=; b=sR6qkv2vIN4K5CgGljzmc6wYryVO8FC97B51SNyi9/UDvnEk8JVq1H6hcJwUHfRjR3BwKd OI59OEetlJaljvwB9+UkGORMYjegx32QhrxS5lG7WMuZIpsSg8I1amuq0iU4IVYpcLOAkY ukXPR+TNzIPDwwm1Odky8lI4l73wIyk26m9cG4n1LoBM0NiQL0u49WrtLmJOaKKErHAbe1 W3K8z7C2JVulR+4GgB7oxIlkRAwjQWxi3LgyZAr6fSStY8a9/A2bKxBelePSXG+2zAFSyz oG1lDr3Qs6NHmhw25xdmXWrxCXFXxtm+o2INYSBzY5xoVNWHjfrgZO0dYpr8Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738365; a=rsa-sha256; cv=none; b=YNVrOACme9Gbqj/Ua4MdQInExO/6Kd3x5FpQHTA2iIGyKJw927ZuQaX5tCtEWbzvk2lwpq LO+KITJwClYOvtEh9DBR5373e5ZdDN1mxWEWVl8fL0zPYfzSLCZvLuQN1boPegE79Tm9hb aQ8cRBTij5VeDhyQ0+bOZuQlhORGlBfai09+zYdeZwKnNWGjDdbqaqScVyPCg/iXIOERY/ TUkNHAFQrWkhljYwRt8all19cL6PxTNi+26u/BsJ6B7fTLci516q3kpLeKb6wAQL1euBoV 7jhdTyEAG1wuA/XJ+cs+DB73dqpvrRU8rJv5ar4LPzmFdqP0/WRx/cplTY9vPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5T3hLlz2tQ for ; Fri, 21 Nov 2025 15:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 322de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b55b92729641 - stable/13 - tests: Add a regression test for commit 7587f6d4840f8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: b55b92729641e05a05cc8526b08bd7ac3dfcb4fc Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:25 +0000 Message-Id: <692082fd.322de.408d2020@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b55b92729641e05a05cc8526b08bd7ac3dfcb4fc commit b55b92729641e05a05cc8526b08bd7ac3dfcb4fc Author: Mark Johnston AuthorDate: 2025-05-28 15:28:36 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +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 | 5 ++ tests/sys/kern/jail_lookup_root.c | 133 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 74c987e55734..f862e41d1d72 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_C+= basic_signal ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test 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 @@ -58,6 +59,10 @@ PROGS+= coredump_phnum_helper PROGS+= pdeathsig_helper PROGS+= sendfile_helper +.PATH: ${SRCTOP}/sbin/mount +SRCS.jail_lookup_root+= jail_lookup_root.c getmntopts.c +CFLAGS.jail_lookup_root+= -I${SRCTOP}/sbin/mount +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()); +}