From nobody Sat Sep 13 22:31:32 2025 X-Original-To: dev-commits-src-main@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 4cPQxx01Dlz67cs2; Sat, 13 Sep 2025 22:31:33 +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 4cPQxw6dYJz3l0t; Sat, 13 Sep 2025 22:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757802692; 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=R13PkNAS9gw20LQjRnr6DJhbUMiIq88GdaaBYrKcHvM=; b=O4SlZcJDlv4s8dAf2Ou+elJ2kwzbiNN5bgYymq2B/ryMnI4RTDTYkMDSUENG0LBIWbTDL1 CqlK/jRnS/PA84HQg3fApgxJf88Dl+u8jp4NsmCpZildPeWigbAJ+BcJYMGKyMV52q9luX luHLyN0niDt76FvR/09SkLo5ldUgoFX8GJu7dChRHr9/U5ooJXRGk9J4WNy9qP6iLe8e08 rWfuY4txuvbjwHyF1IBN4rKQromEVNcbGE5y3xeYGmjv0PiKcCrOJZiW247Hxhvl3FTEgX 6YqiY+ad4usmsi3AJx7wOu6ELjiys+X5c73gfIP8Yf7+ROg8eOZ9dUN9nOxo1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757802692; 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=R13PkNAS9gw20LQjRnr6DJhbUMiIq88GdaaBYrKcHvM=; b=YgPJmk0xIfyiUDzCehYa9kbYSxqSCdWQoSN4Gy72P3eYbaRCguJ3MXtH/Vvxg8rX6iRjf3 +HigzIfBE694wHaGqcprFmkr40kwFpSpo7RFyXL0qs8Aj5mnE7qRfH8FXw6pulRWvwgWtU UbdzgZ9kF8fahCW5t6mSA7WAr5wgXJ1TtkrDJOrKIFpi6enWohyL1xyPljBNJjaOZt5A5H v73qZcGp7lwqfPxmJLa4Nz3Y5c3Ro3zsetboRZ1tZRqJagJNGYfontEJh6MXShDJsZohul BL0surfWQ36S809FsCtSf6kHK7WmV+REULiGeUM0LyNmb2Nj+wKfX1ew5/wNxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757802692; a=rsa-sha256; cv=none; b=Dc6w6Vc2fYDE3Fc9QimWsn2jipQTXWB79kQ8rrHrY50T5J5S/Ck+Nx/BJYKQWjR5QQTp9j wR5E1HOE+n0+fFq6r+OCVwqAB1MmvaOHkDvbO45TDSQF8VUxMboQPUSQYtJD6KSa6CAiSL F3B7vYIbAoo82LPqrzvVEx1192SG1vOQZ5iw6We3sgJj16OAJ7vMBF6HAkTjP3hVyr6R3Z ShvJ2uH+LdfO3PZRG7VjtdNMi8hsVgIipDx5lRbN1Eh1ikFqgCj9cKzXVg/I6Sm5j+EzPx f9FHoqbiE9xat2sAtd3cWkUQIVdAk2Xp5dhDU5g82Nf1IlCqOaXMeGE3Ad8CKg== 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 4cPQxw6DgRzyN3; Sat, 13 Sep 2025 22:31:32 +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 58DMVWOv020301; Sat, 13 Sep 2025 22:31:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58DMVWLD020295; Sat, 13 Sep 2025 22:31:32 GMT (envelope-from git) Date: Sat, 13 Sep 2025 22:31:32 GMT Message-Id: <202509132231.58DMVWLD020295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: e75dda31c1ee - main - jaildesc: remove desc from the sysctl parameter list List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e75dda31c1eead9ad40580bd8fec17f2bbf55a21 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=e75dda31c1eead9ad40580bd8fec17f2bbf55a21 commit e75dda31c1eead9ad40580bd8fec17f2bbf55a21 Author: Jamie Gritton AuthorDate: 2025-09-13 22:30:14 +0000 Commit: Jamie Gritton CommitDate: 2025-09-13 22:30:14 +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. MFC after: 3 days --- 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");