From nobody Mon Jun 22 13:26:24 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 4gkTVm5lPGz6hBbp for ; Mon, 22 Jun 2026 13:26:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkTVm1QLZz3r8L for ; Mon, 22 Jun 2026 13:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134784; 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=wbAt1MjGbIgZO2zPPGZNEt+U9VPSThrMXjRS1XtLjZk=; b=W9hEVy/pDfsw0nmwKpgyWhXy9GJgGWSJQdzU5Raopv+9D9rEXIpzMGF45KWOdqqwO+znVA nIH6RjdfL6aO5nw7mZbmcbKUWlfIT9k6AoxOrwY63Xakzanhn0TwDDGr5v2zAu8KD/GksO 0pTJapdz8Oufh3FYeQLOBLVWF4iQpMyEuW4F5Hcg+3Q0LCnUmKObm+/YXGwFSFYQF9k7QQ xHWtSPq70iIhx+a3C4UR/Cyzfhyx92Xv0AbXR8lEN2CEJHF9gzFm/rLovDMmmtmRyfWSXd KET9Ib8y3h9MWyDH28DUXElhzPnMzyUAeBev6mQdoKrI6x7BZafmNvsqZ2h7rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782134784; a=rsa-sha256; cv=none; b=debkkJ+3xPuBHGhw2xfz4RhaKDCrj2PtuhDmiTVg18rZ0nmcEjOfdO6hlQGPhmmQC5x+qz T66ff9q7aBdCxYmHgudo9vXX+dRMhEehH8xQQZ8WTKV/HDPQs3lxbQy+2j9yeE0MPir+/Q 8MQv0acnEO82ey1w2/uvTdldJ4iprLiQExnaT33IKWrqlaMOm9+XFnHwB3Lt9zal69EWEj bsnVrlCitp7P+SODhn+IF5T9oX8W/rp9XIf2AwqtC1zbB1CzIBBTvJbSGFQq3U7Pz4kLnC UhT2/efXYaq8F/UuDv1CnCtOME8XsgGOvJDHpFcuiPQ3sozTz70SGcNtL1lsGg== 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=1782134784; 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=wbAt1MjGbIgZO2zPPGZNEt+U9VPSThrMXjRS1XtLjZk=; b=bbs+c2mwGaWvEfJDrryQnXm3WnS7cHDtL6J5FlqaUjpv+FWPoejOshDKVGUQhBldamg/OO VI4c+HmzydYJZhaXaVV/1fXcRoEV0Ls5mj34XkR2/dZwNWf9PeNaxbutIe1DrhtVsvHJgM zvbabV+Ap/l5APpUWajHVWKmRVpruePi9GsbulRNhbApLXkdk/nRUftz5Fe8wsbOXCHdkb TKL1H2E1aOJRDkil7UtIeohl5/2GFt0WeB6G7HIrpsqOy5ygWQz0jtcO3qgqCaFX0pr8f7 enCd8v/QhVaeapSTdMeA4YwMlwYyMQ+VeGzibJhYeEy87Wk7/MIjte3bGEAedg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVm0VRFzqPG for ; Mon, 22 Jun 2026 13:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39434 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 13:26:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 94a47b35a475 - stable/15 - tests/jaildesc: Add some more test scenarios 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 94a47b35a4752739b73256024e80099321da7aed Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 13:26:24 +0000 Message-Id: <6a393800.39434.1ce94e00@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=94a47b35a4752739b73256024e80099321da7aed commit 94a47b35a4752739b73256024e80099321da7aed Author: Mark Johnston AuthorDate: 2026-06-12 14:58:19 +0000 Commit: Mark Johnston CommitDate: 2026-06-22 13:26:09 +0000 tests/jaildesc: Add some more test scenarios MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D57147 (cherry picked from commit fe03a78c5d5966992c8df482d984bae83dc92b45) --- tests/sys/kern/Makefile | 2 +- tests/sys/kern/jaildesc.c | 204 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+), 1 deletion(-) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 972e0aa0fb9d..b581d1e6ca30 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -95,7 +95,7 @@ PROGS+= sendfile_helper LIBADD.aslr+= util LIBADD.copy_file_range+= md LIBADD.jail_lookup_root+= jail util -LIBADD.jaildesc+= pthread +LIBADD.jaildesc+= kvm pthread CFLAGS.sys_getrandom+= -I${SRCTOP}/sys/contrib/zstd/lib LIBADD.sys_getrandom+= zstd LIBADD.sys_getrandom+= c diff --git a/tests/sys/kern/jaildesc.c b/tests/sys/kern/jaildesc.c index 11d751554887..cfdd1529fdfa 100644 --- a/tests/sys/kern/jaildesc.c +++ b/tests/sys/kern/jaildesc.c @@ -6,16 +6,56 @@ #include #include +#include +#include #include +#include #include #include +#include #include #include #include +#include #include #include +#include + +/* + * Block until a thread in the specified process is sleeping in the specified + * wait message. + */ +static void +wait_for_naptime(pid_t pid, const char *wmesg) +{ + kvm_t *kd; + int count; + + kd = kvm_openfiles(NULL, "/dev/null", NULL, O_RDONLY, NULL); + ATF_REQUIRE(kd != NULL); + for (;;) { + struct kinfo_proc *kip; + int i; + + usleep(1000); + kip = kvm_getprocs(kd, KERN_PROC_PID | KERN_PROC_INC_THREAD, + pid, &count); + ATF_REQUIRE(kip != NULL); + for (i = 0; i < count; i++) { + ATF_REQUIRE(kip[i].ki_stat != SZOMB); + if (kip[i].ki_stat == SSLEEP && + strcmp(kip[i].ki_wmesg, wmesg) == 0) + break; + } + if (i < count) + break; + } + + kvm_close(kd); +} + /* * Create a persistent jail and return an owning descriptor for it. * The jail is removed when the returned descriptor is closed. @@ -191,11 +231,175 @@ ATF_TC_BODY(poll_close_race_get_desc, tc) ATF_REQUIRE_MSG(close(owning_jd) == 0, "close: %s", strerror(errno)); } +/* + * Verify that a process inside a jail cannot obtain a jail descriptor for + * its own jail. + */ +ATF_TC(curjail_get); +ATF_TC_HEAD(curjail_get, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(curjail_get, tc) +{ + char namebuf[MAXHOSTNAMELEN]; + struct iovec iov[4]; + int desc, error, jid, n; + + (void)create_jail("jaildesc_get_desc_current_jail"); + + strlcpy(namebuf, "jaildesc_get_desc_current_jail", sizeof(namebuf)); + jid = -1; + n = 0; + iov[n].iov_base = __DECONST(void *, "name"); + iov[n++].iov_len = sizeof("name"); + iov[n].iov_base = namebuf; + iov[n++].iov_len = strlen(namebuf) + 1; + jid = jail_get(iov, n, 0); + ATF_REQUIRE_MSG(jid >= 0, "jail_get: %s", strerror(errno)); + + error = jail_attach(jid); + ATF_REQUIRE_MSG(error == 0, "jail_attach: %s", strerror(errno)); + + /* + * Now that we are inside the jail, verify that we cannot obtain a + * descriptor for it. + */ + strlcpy(namebuf, "jaildesc_get_desc_current_jail", sizeof(namebuf)); + desc = -1; + n = 0; + iov[n].iov_base = __DECONST(void *, "name"); + iov[n++].iov_len = sizeof("name"); + iov[n].iov_base = namebuf; + iov[n++].iov_len = strlen(namebuf) + 1; + iov[n].iov_base = __DECONST(void *, "desc"); + iov[n++].iov_len = sizeof("desc"); + iov[n].iov_base = &desc; + iov[n++].iov_len = sizeof(desc); + ATF_REQUIRE_MSG(jail_get(iov, n, JAIL_GET_DESC) == -1, + "jail_get succeeded unexpectedly"); + ATF_REQUIRE_MSG(jail_get(iov, n, JAIL_OWN_DESC) == -1, + "jail_get succeeded unexpectedly"); +} + +static void +nop(int signum __unused) +{ +} + +/* + * Close an owning descriptor while in the corresponding jail. + */ +ATF_TC(self_destruct); +ATF_TC_HEAD(self_destruct, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(self_destruct, tc) +{ + int error, jd, status; + pid_t pid; + + jd = create_jail("jaildesc_self_destruct"); + + pid = fork(); + ATF_REQUIRE_MSG(pid >= 0, "fork: %s", strerror(errno)); + if (pid == 0) { + struct sigaction sa; + + error = jail_attach_jd(jd); + if (error != 0) + _exit(1); + + sa.sa_handler = nop; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + error = sigaction(SIGALRM, &sa, NULL); + if (error != 0) + _exit(2); + + pause(); + close(jd); + /* NOTREACHED? */ + _exit(3); + } + + wait_for_naptime(pid, "sigsusp"); + + error = close(jd); + ATF_REQUIRE_MSG(error == 0, "close: %s", strerror(errno)); + + error = kill(pid, SIGALRM); + ATF_REQUIRE_MSG(error == 0, "kill: %s", strerror(errno)); + + pid = waitpid(pid, &status, 0); + ATF_REQUIRE_MSG(pid >= 0, "waitpid: %s", strerror(errno)); + ATF_REQUIRE(WIFSIGNALED(status)); + ATF_REQUIRE_EQ(WTERMSIG(status), SIGKILL); +} + +/* + * Try to get an fd for a non-existent jail. + */ +ATF_TC(at_desc_bad_fd); +ATF_TC_HEAD(at_desc_bad_fd, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(at_desc_bad_fd, tc) +{ + int jd, status; + pid_t pid; + + jd = create_jail("jaildesc_at_desc_bad_fd"); + + pid = fork(); + ATF_REQUIRE_MSG(pid >= 0, "fork: %s", strerror(errno)); + if (pid == 0) { + struct iovec iov[4]; + char namebuf[MAXHOSTNAMELEN]; + int desc, i, n; + + if (jail_attach_jd(jd) != 0) + _exit(1); + + /* Regression test: loop here to trigger a refcount leak. */ + for (i = 0; i < 100; i++) { + strlcpy(namebuf, "nonexistent", sizeof(namebuf)); + desc = STDIN_FILENO; + n = 0; + iov[n].iov_base = __DECONST(void *, "name"); + iov[n++].iov_len = strlen("name") + 1; + iov[n].iov_base = namebuf; + iov[n++].iov_len = sizeof(namebuf); + iov[n].iov_base = __DECONST(void *, "desc"); + iov[n++].iov_len = strlen("desc") + 1; + iov[n].iov_base = &desc; + iov[n++].iov_len = sizeof(desc); + if (jail_get(iov, n, JAIL_AT_DESC) != -1) + _exit(2); + if (errno != EINVAL) + _exit(3); + } + _exit(0); + } + + pid = waitpid(pid, &status, 0); + ATF_REQUIRE_MSG(pid >= 0, "waitpid: %s", strerror(errno)); + ATF_REQUIRE_MSG(WIFEXITED(status) && WEXITSTATUS(status) == 0, + "child failed with status %d", status); + + ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno)); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, poll_close_race); ATF_TP_ADD_TC(tp, poll_remove_wakeup); ATF_TP_ADD_TC(tp, poll_close_race_get_desc); + ATF_TP_ADD_TC(tp, curjail_get); + ATF_TP_ADD_TC(tp, self_destruct); + ATF_TP_ADD_TC(tp, at_desc_bad_fd); return (atf_no_error()); }