From nobody Mon Nov 02 20:10:24 2026 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 4jJN9Y1pSgz6yRf7 for ; Mon, 02 Nov 2026 20:10: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJN9X6rGkz4gLf for ; Mon, 02 Nov 2026 20:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793650225; 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=Dg1FC/wKCMxSg6hzH71t57LBDN5sCz9hweO7BTE+rdM=; b=kJc7ISzeCGjPH/E5nPETujF3NzUrgy55b9mukYpbcTLJcUK2JSz6Nt9mswbPEIwUayqLyT otdyPRB5Gdu+ZheyB2HwxRoFglT42HpoWlS3uZf4T8id4HU1lvB6CcCkTDh7ZpNpvHXS+P 6/SEgpexOwCdZJVUGWY5UmSE1HbjcT0cMH2PiaQFHj+HlQERKJ0RJHLc/E0t1R7PtFUKgl COaU9F4rN8pkuXwktUnPg/PwdOwkb8WwTlJMp4Xeygza8IRRNiArzctlIIBnSRdy+2qHWs 4ndMTIXLmJ3wAsWeKhl+E0ETWxo0Qsc+DjAmTXaY13TQ5PwYglEuicblLJNgKA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793650225; b=KwALjeNLyoC2N5tC1w3Y8UbzU+YAG/Z2U6C6kGNPGirJfJ2X8f7K6h4yz/5q9t92rd3xEY EtpssvdvOK69uYDpTN5DH3UZSTV0k3hIJQlcv+mOx2otiWn6kQ1+MFAngO76+zWSha7A4T A14PW4cX4MVvryhZSUMbqGEMN8mOJrRHuBl1+oogNY600tP0FR68a4OgA56YCISSFMBqLF ixLjcpNV595KpmPQ6lAGkclFfnJCHY9ztdwOczzQajq8y8JstMn7L8Sm5dnZhOQRUqpK/A neTZd+XP6tP2PzyFaGS1NGONAMKUry4a/zKCv14T1VCvwlx18IVhzqYdYzCQVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793650225; 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=Dg1FC/wKCMxSg6hzH71t57LBDN5sCz9hweO7BTE+rdM=; b=Bku5DuesnfnW1uAMfhGkkxbwU7vzsKfaiO8cOVE7KsUVGeNqSEkGXWypBAxc4QrcuUwjw6 6ws3af1lJAjjaJDfYaV7W1elM2CYSJnxtxiv0THpV5a8bj1+GAIZpqgq9YGtNt8Lfrzgob bad/UkUonN7GlcWKjGeQ5R//Ee6Hhx3s9MOacf6FfnjgYujhg3XTlBvBJnubIPrcma1QRD 2wPiy54hA2NPyYrKIIRP9DTSKfp+0nQTRR/gp+3M4/wD5tcUDOwx0HxC6ZhlJyCrUXePAZ iSNVbr207VpjqwKXeQ3pjQLjCC0poeoDdnj11Tj6BbAJZUUx0GFmQPbEjG/UYw== 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 4jJN9X6FLNz10y3 for ; Mon, 02 Nov 2026 20:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 20:10:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: b3b50cbd4647 - main - jail: return a new descriptor from jail_get(JAIL_USE_DESC | JAIL_GET_DESC) List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3b50cbd4647bb095e0cb5b72e933bc3036e412d Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 20:10:24 +0000 Message-Id: <6ae8ee30.3a4c8.3c60ba55@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=b3b50cbd4647bb095e0cb5b72e933bc3036e412d commit b3b50cbd4647bb095e0cb5b72e933bc3036e412d Author: Abdelkader Boudih AuthorDate: 2026-11-02 20:09:55 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-02 20:09:55 +0000 jail: return a new descriptor from jail_get(JAIL_USE_DESC | JAIL_GET_DESC) Prior to this change, `jail_get` when called with `JAIL_USE|JAIL_GET_DESC` would fail to return a valid descriptor in the positive case because the `JAIL_USE_DESC` block jumped to `found_prison` before the descriptor was allocated. This resulted in the returned jail descriptor always being -1, despite the call being successful. This change fixes the logic so `jfd_out` is properly initialized in the aforementioned scenario. MFC after: 3 days Reviewed by: jamie, ngie, adrian Differential Revision: https://reviews.freebsd.org/D60984 --- sys/kern/kern_jail.c | 18 +++++++++++------- tests/sys/kern/jaildesc.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 3b9809671f21..ae22e43aef62 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2645,6 +2645,17 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) vfs_opterror(opts, "unexpected desc"); goto done; } + if (flags & (JAIL_GET_DESC | JAIL_OWN_DESC)) { + /* + * Allocate a jail descriptor to return later. + * This must happen before the JAIL_USE_DESC + * lookup below, which jumps to found_prison. + */ + error = jaildesc_alloc(td, &jfp_out, &jfd_out, + flags & JAIL_OWN_DESC); + if (error) + goto done; + } if (flags & JAIL_USE_DESC) { /* Get the jail from its descriptor. */ error = jaildesc_find(td, jfd_in, &pr, NULL); @@ -2673,13 +2684,6 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) prison_free(mypr); mypr = jdpr; } - if (flags & (JAIL_GET_DESC | JAIL_OWN_DESC)) { - /* Allocate a jail descriptor to return later. */ - error = jaildesc_alloc(td, &jfp_out, &jfd_out, - flags & JAIL_OWN_DESC); - if (error) - goto done; - } } else goto done; diff --git a/tests/sys/kern/jaildesc.c b/tests/sys/kern/jaildesc.c index 6c7993cfc1d3..99b759cfc9d1 100644 --- a/tests/sys/kern/jaildesc.c +++ b/tests/sys/kern/jaildesc.c @@ -389,6 +389,45 @@ ATF_TC_BODY(at_desc_bad_fd, tc) ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno)); } +/* + * Look a jail up by descriptor and ask for a descriptor back. + */ +ATF_TC(use_desc_get_desc); +ATF_TC_HEAD(use_desc_get_desc, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(use_desc_get_desc, tc) +{ + struct iovec iov[2]; + int desc, jd, jid, n; + + jd = create_jail("jaildesc_use_desc_get_desc"); + + desc = jd; + n = 0; + 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); + jid = jail_get(iov, n, JAIL_USE_DESC | JAIL_GET_DESC); + ATF_REQUIRE_MSG(jid >= 0, "jail_get: %s", strerror(errno)); + ATF_REQUIRE_MSG(desc >= 0 && desc != jd, + "jail_get returned descriptor %d, input was %d", desc, jd); + + /* The returned descriptor must name the same jail. */ + n = 0; + 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); + ATF_REQUIRE_MSG(jail_get(iov, n, JAIL_USE_DESC) == jid, + "jail_get: %s", strerror(errno)); + + ATF_REQUIRE_MSG(close(desc) == 0, "close: %s", strerror(errno)); + ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno)); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, poll_close_race); @@ -397,6 +436,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, curjail_get); ATF_TP_ADD_TC(tp, self_destruct); ATF_TP_ADD_TC(tp, at_desc_bad_fd); + ATF_TP_ADD_TC(tp, use_desc_get_desc); return (atf_no_error()); }