From nobody Tue Feb 24 16:04:43 2026 X-Original-To: dev-commits-src-branches@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 4fL2bw1sMXz6SQ0K for ; Tue, 24 Feb 2026 16:04:44 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL2bv3sR0z3pZg for ; Tue, 24 Feb 2026 16:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771949083; 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=OyUYX9ny0ZnsgxQH9iZT9WyqKvv4YQIoL9MAuXPWsUo=; b=pnu/KgvZGXRvTZrpuFqMVtidud209qHynY/RdUytzzZyAzZTCV/7Ky67XO3EF2Ct79xnDS IPDGebPdGGNCJIcxCHqjAQovnBy7uJSGixjRbgEEPK0HQEfkURQh7giENiYKJHpcpvkew1 163lV5zEsKsnKkgY0rAvvgpNCjTgHxqe8KRIaQGgFM1OIpQNi9BZ39PViKYqxVmHD2K2RY LNGBpAdUD4SW+HnC4LjZsBcRm6d4qoln5pmyJnBqHDrvZtUb/Sjp9lp2+QWisN2TuQ4Wf5 GzjHqwCcKXes05Nroe4S2Ww2zlEzRER781dg3VSHMuKOucbm/S8GoiA6ZR0uoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771949083; a=rsa-sha256; cv=none; b=w0CJts4bXvWVrnkghF7rThKiuR1e9m+g0c8TY+5r2kdl/8XCIvh8hWf0AmnUzfXGgjbzqZ 1DGNZKLZHKVi13bPY6nZJO3F4ewwPweNxhWLQN+Fcg8h5zs15iOCNjNVjjlnZl85hh+Y36 LMcWPH9QbYRLYHIIyLVOdwF1Tp/7P1TOrs2NdaY/IHjKppoteRyDavmdw085Ki7geQNznz MNHegiSBkPmEcew72EOKJB0AbNjik7jQPieRjmK/c+6OSOEBWCQqp0ER8LfvF9R8p7NQ9d Tly5x7oVp1zt5Ew2cYLUu4BldOCeholLFDgfkP1ziuRlzgyt9XFEx/a+i8Stxw== 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=1771949083; 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=OyUYX9ny0ZnsgxQH9iZT9WyqKvv4YQIoL9MAuXPWsUo=; b=k/x+VpLFrmAATMJHDSTQHVX/Z/+zQYe8YT505XZ7gbUuK+aqAe/154yHjdjWfVUNUG6DNB vdy0PBOGMReHMz66lN0EjoxV9GISG7goMKMQjKP5b9kUMEVrxq5PE5Ltuglm9QR+LIHSot aQB5cjAhhZmQCnQ0KyfGA8eOml7zi7birIEFf3LNKwCoXKs8WiQXZvTxWsn4UWieHm+6SN jtN4RNfBON0tcedwTOGCaDEbt9snKPTK3afqS4JlLkVpubU7hK4KX0jIoacEy6ARPHN65r fcoLdLfpzMx/Fqdwot8vQhYbKn4YoVQDmwaBhMklZVEJkDye0sCdyqClke6kUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL2bv2mc3z6xk for ; Tue, 24 Feb 2026 16:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 275b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 16:04:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ecec5410875f - releng/13.5 - unix/tests: Add a regression test for fd transfer across jails 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: ecec5410875f7ffcfdd3d6d5a2cac445203274b2 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 16:04:43 +0000 Message-Id: <699dcc1b.275b4.7098e4ce@gitrepo.freebsd.org> The branch releng/13.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ecec5410875f7ffcfdd3d6d5a2cac445203274b2 commit ecec5410875f7ffcfdd3d6d5a2cac445203274b2 Author: Mark Johnston AuthorDate: 2025-06-24 20:08:22 +0000 Commit: Mark Johnston CommitDate: 2026-02-23 01:48:38 +0000 unix/tests: Add a regression test for fd transfer across jails Approved by: so MFC after: 3 weeks (cherry picked from commit 5843b8ee02e99527c28f579acfc1f48e10033529) (cherry picked from commit c9977132865ec06d2d3e1f404e946836019ff7a2) --- tests/sys/kern/Makefile | 1 + tests/sys/kern/unix_passfd_test.c | 134 +++++++++++++++++++++++++++++++++++++- 2 files changed, 133 insertions(+), 2 deletions(-) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index f862e41d1d72..d499fd525222 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -75,6 +75,7 @@ LIBADD.socket_msg_waitall+= pthread LIBADD.sendfile_helper+= pthread LIBADD.fdgrowtable_test+= util pthread kvm procstat LIBADD.sigwait+= rt +LIBADD.unix_passfd_test+= jail NETBSD_ATF_TESTS_C+= lockf_test NETBSD_ATF_TESTS_C+= mqueue_test diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c index d5654ed62315..d8f6973cd3b0 100644 --- a/tests/sys/kern/unix_passfd_test.c +++ b/tests/sys/kern/unix_passfd_test.c @@ -25,15 +25,18 @@ * SUCH DAMAGE. */ -#include -#include +#include +#include #include #include #include #include +#include +#include #include #include +#include #include #include #include @@ -713,6 +716,132 @@ ATF_TC_BODY(empty_rights_message, tc) (void)close(putfd); } +ATF_TC_WITH_CLEANUP(cross_jail_dirfd); +ATF_TC_HEAD(cross_jail_dirfd, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(cross_jail_dirfd, tc) +{ + int error, sock[2], jid1, jid2, status; + pid_t pid1, pid2; + + domainsocketpair(sock); + + error = mkdir("./a", 0755); + ATF_REQUIRE(error == 0); + error = mkdir("./b", 0755); + ATF_REQUIRE(error == 0); + error = mkdir("./c", 0755); + ATF_REQUIRE(error == 0); + error = mkdir("./a/c", 0755); + ATF_REQUIRE(error == 0); + + jid1 = jail_setv(JAIL_CREATE, + "name", "passfd_test_cross_jail_dirfd1", + "path", "./a", + "persist", NULL, + NULL); + ATF_REQUIRE_MSG(jid1 >= 0, "jail_setv: %s", jail_errmsg); + + jid2 = jail_setv(JAIL_CREATE, + "name", "passfd_test_cross_jail_dirfd2", + "path", "./b", + "persist", NULL, + NULL); + ATF_REQUIRE_MSG(jid2 >= 0, "jail_setv: %s", jail_errmsg); + + pid1 = fork(); + ATF_REQUIRE(pid1 >= 0); + if (pid1 == 0) { + ssize_t len; + int dfd, error; + char ch; + + error = jail_attach(jid1); + if (error != 0) + err(1, "jail_attach"); + + dfd = open(".", O_RDONLY | O_DIRECTORY); + if (dfd < 0) + err(1, "open(\".\") in jail %d", jid1); + + ch = 0; + len = sendfd_payload(sock[0], dfd, &ch, sizeof(ch)); + if (len == -1) + err(1, "sendmsg"); + + _exit(0); + } + + pid2 = fork(); + ATF_REQUIRE(pid2 >= 0); + if (pid2 == 0) { + int dfd, dfd2, error, fd; + char ch; + + error = jail_attach(jid2); + if (error != 0) + err(1, "jail_attach"); + + /* Get a directory from outside the jail root. */ + recvfd_payload(sock[1], &dfd, &ch, sizeof(ch), + CMSG_SPACE(sizeof(int)), 0); + + if ((fcntl(dfd, F_GETFD) & 2) == 0) + errx(1, "dfd does not have FD_RESOLVE_BENEATH set"); + + /* Make sure we can't chdir. */ + error = fchdir(dfd); + if (error == 0) + errx(1, "fchdir succeeded"); + if (errno != ENOTCAPABLE) + err(1, "fchdir"); + + /* Make sure a dotdot access fails. */ + fd = openat(dfd, "../c", O_RDONLY | O_DIRECTORY); + if (fd >= 0) + errx(1, "openat(\"../c\") succeeded"); + if (errno != ENOTCAPABLE) + err(1, "openat"); + + /* Accesses within the sender's jail root are ok. */ + fd = openat(dfd, "c", O_RDONLY | O_DIRECTORY); + if (fd < 0) + err(1, "openat(\"c\")"); + + dfd2 = openat(dfd, "", O_EMPTY_PATH | O_RDONLY | O_DIRECTORY); + if (dfd2 < 0) + err(1, "openat(\"\")"); + if ((fcntl(dfd2, F_GETFD) & 2) == 0) + errx(1, "dfd2 does not have FD_RESOLVE_BENEATH set"); + + _exit(0); + } + + error = waitpid(pid1, &status, 0); + ATF_REQUIRE(error != -1); + ATF_REQUIRE(WIFEXITED(status)); + ATF_REQUIRE(WEXITSTATUS(status) == 0); + error = waitpid(pid2, &status, 0); + ATF_REQUIRE(error != -1); + ATF_REQUIRE(WIFEXITED(status)); + ATF_REQUIRE(WEXITSTATUS(status) == 0); + + closesocketpair(sock); +} +ATF_TC_CLEANUP(cross_jail_dirfd, tc) +{ + int jid; + + jid = jail_getid("passfd_test_cross_jail_dirfd1"); + if (jid >= 0 && jail_remove(jid) != 0) + err(1, "jail_remove"); + jid = jail_getid("passfd_test_cross_jail_dirfd2"); + if (jid >= 0 && jail_remove(jid) != 0) + err(1, "jail_remove"); +} + ATF_TP_ADD_TCS(tp) { @@ -728,6 +857,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, truncated_rights); ATF_TP_ADD_TC(tp, copyout_rights_error); ATF_TP_ADD_TC(tp, empty_rights_message); + ATF_TP_ADD_TC(tp, cross_jail_dirfd); return (atf_no_error()); }