From nobody Mon Sep 15 04:04:19 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 4cQBHS4dgvz67yYX; Mon, 15 Sep 2025 04:04:20 +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 4cQBHR4pLYz42pl; Mon, 15 Sep 2025 04:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757909059; 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=MYc6HaxLe749fbOs/vEyPnAmUpGWgCIJXAbwGj6aPRk=; b=UcpwCrodOT0SDIgB706Rtej3q9fCD1VP4+LQiClP2xj+r5FVa4ljQAB45jjAy9LSdZo3fV 1BDW3rJVcnfsPZS+XRfgCsg8YD4pBKq0G62ATS/QsRrZjgf5gXBjjm0RaxRRbKIkv8uC10 1GqNiMBhafV6McOUDEnkoC+w176xcHblmIE9LWfAwRcyIkDeLYMuDhb8BI6XKQrl4VIhjM 8IqVpcfkosGFOMvSUG7Z2WKB9YiGXDWgsjv6sRwSZ+L0tP6n+Z5fUiMB8TA5vjMHJ2yU+C U1+G08sGuPDdOI55h5JNuIGBUNh/3EWtLPvWdKr6GaZOPoJX8Fi15/9EQhTGpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757909059; 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=MYc6HaxLe749fbOs/vEyPnAmUpGWgCIJXAbwGj6aPRk=; b=Mjb0pno2ZuEGu2YK9KIKQpKYchZUQ85MMdMPQ9/fexNyXApSyOG9R4v5chRpqaBAsqf0QO FKIUcLu+c1e1ateGDyiYg1WieiI96bHJKPpfKM61/Z6ztqrnweDmfyCm8Yx4oZpcBiyC3y p7lGWp3HA7oONMQMTLWiAYP1e53W+yADrmO453h98Dvs/tOfd2ciqf6l9r1BQ007i1bmU1 +xVP4CwveiIPyf6qY0mXz3Bp57ApAhCbbUABY1JP/ra8537UchsRFuz8SQQ2NvHEEf4kv2 ljW5+x+HHWiqg45E1lyjgd+WU1yHiADA/oSIDStN0Ja8j+6AIN40+u9CqFTv3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757909059; a=rsa-sha256; cv=none; b=w6+0Bx8zXrSWIZzHRvNeN0Qza9zaLDxnXcANTKjXj/D0A4QViBxDzmLbtIJx5lnBKQMCWd CajRBwFLGWS5yjDiMj20RZpi4DFGJMaAieZBsgyzO6kAQ0RaFbuoVidKIVEfeC/MFhnRwE jemfKt7v/zd8HJR+bvbPzf5DvTutpG9gTdOrMmsIJ+0/Ik400btk+WNmKN5rI6L2b3Z8yb u7XpbiwzzUCMsExrzQfXZNMx0vFAH+cfhcM4l54wvN7yFQC0gEbUSM8YL45s1rTTKiORIx ACpSl6dFDfJ1qaQqZD3ZacC3lTAmjyA1XGCP7BWUA2NHTy+NJnEBaZ1Sit8Kgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQBHR2NGtzfkN; Mon, 15 Sep 2025 04:04:19 +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 58F44JY4046739; Mon, 15 Sep 2025 04:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58F44J5w046736; Mon, 15 Sep 2025 04:04:19 GMT (envelope-from git) Date: Mon, 15 Sep 2025 04:04:19 GMT Message-Id: <202509150404.58F44J5w046736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: deaa609d065d - stable/15 - jaildesc: remove desc from the sysctl parameter list 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: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: deaa609d065d525a13392d09057afa237fbe4d68 Auto-Submitted: auto-generated The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=deaa609d065d525a13392d09057afa237fbe4d68 commit deaa609d065d525a13392d09057afa237fbe4d68 Author: Jamie Gritton AuthorDate: 2025-09-13 22:30:14 +0000 Commit: Jamie Gritton CommitDate: 2025-09-15 03:34:00 +0000 jaildesc: remove desc from the sysctl parameter list Like lastjid, desc should count as a pseudo-parameter. The difference lies entirely in the security.jail.param sysctls, which list all of the jail parameters. Since desc opens and returns a file descriptor, it has no place in such uses as "jls all." Like lastjid, it's still recognized by the kernel if passed in/out, and hard-coded into libjail so it can be recognized there. (cherry picked from commit e75dda31c1eead9ad40580bd8fec17f2bbf55a21) --- lib/libjail/jail.c | 10 +++++++++- sys/kern/kern_jail.c | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c index f761bc6993e5..ad3348af0d2d 100644 --- a/lib/libjail/jail.c +++ b/lib/libjail/jail.c @@ -920,13 +920,21 @@ jailparam_type(struct jailparam *jp) } desc; int mib[CTL_MAXNAME]; - /* The "lastjid" parameter isn't real. */ + /* + * Some pseudo-parameters don't show up in the sysctl + * parameter list. + */ name = jp->jp_name; if (!strcmp(name, "lastjid")) { jp->jp_valuelen = sizeof(int); jp->jp_ctltype = CTLTYPE_INT | CTLFLAG_WR; return (0); } + if (!strcmp(name, "desc")) { + jp->jp_valuelen = sizeof(int); + jp->jp_ctltype = CTLTYPE_INT | CTLFLAG_RW; + return (0); + } /* Find the sysctl that describes the parameter. */ mib[0] = 0; diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 43035dc009b3..a75ba89d2a7e 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4935,7 +4935,6 @@ sysctl_jail_param(SYSCTL_HANDLER_ARGS) * jail creation time but cannot be changed in an existing jail. */ SYSCTL_JAIL_PARAM(, jid, CTLTYPE_INT | CTLFLAG_RDTUN, "I", "Jail ID"); -SYSCTL_JAIL_PARAM(, desc, CTLTYPE_INT | CTLFLAG_RW, "I", "Jail descriptor"); SYSCTL_JAIL_PARAM(, parent, CTLTYPE_INT | CTLFLAG_RD, "I", "Jail parent ID"); SYSCTL_JAIL_PARAM_STRING(, name, CTLFLAG_RW, MAXHOSTNAMELEN, "Jail name"); SYSCTL_JAIL_PARAM_STRING(, path, CTLFLAG_RDTUN, MAXPATHLEN, "Jail root path");