From nobody Tue Sep 24 17:16:18 2024 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 4XCmjb00M6z5Y4m1; Tue, 24 Sep 2024 17:16:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XCmjZ6dTJz4Tf6; Tue, 24 Sep 2024 17:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727198178; 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=UfeN/zeaIX4ez5ZNGBPbsBeiY4Du/Tn6IsjFnYscwKo=; b=EyXBj3RbK50UwE2YcNY2uY2KVTfXec9YcQAwp7nriswPpq65WRmVyJzvBl/dsHQ+R8vT51 Q8qJ5N5eDaod+F/KLV9Ad7DmyoEo6cdVtKEMg+PKO8vozaODfKkbpaw54Rc6SpuCwjyCSV gyZHeDKh1dR/UjSt7i8paxX+Io29fM4SQij0trUd3lfmNtDv1qRSdFT5Ps+R8NzGqDLoWt +blrPlTS1NZspPrY6/TbbNVf4/BNoT3G8P5Cw1MrIZIwAzru7FKVfn8E34jkzo3jNfidmC sC1CPZFtcm9XjdYW9XbDQSDOwsxrLeq0kqadwGmXBIGKIdD6ps7kecdMwajwaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727198178; a=rsa-sha256; cv=none; b=kbXM0aCUsh6x5bDTXeLK9xvpGqHCGJ2G4dxK/n4E5nJcluWEkO8qymGymNbMZChF4Pbl84 FGUgJJXPAIELQZBEBByo2fyMseX/YPH8JOHDTH8aV8cbONEKwwT6cElxf+4JS93Dfoao4G +EiWcYCalodDF+TeEAtB3a882ZD+Dj6r1GQOBylOXnNny9FMgbrfzGD/Oxw7qceJT+KdWw FOulsk7vxIrRCb2eG4u2n9XpjHDmncQ1NgVL5mZGJYfAUN6I8VNAVRA2xqT6TLEyS9RFgd ua565dlPo7FH3mA971mRIgAmOqRXTAl10vqpe+namNAxnThf+ksWC6M9dZFgeQ== 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=1727198178; 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=UfeN/zeaIX4ez5ZNGBPbsBeiY4Du/Tn6IsjFnYscwKo=; b=UccnU5nohgfVG+CDX9G0ApSU1r21Uwff8CI+3oBnxA6hSnXxZhCDkxeZj2+ISiYAaj3R3o FQsi23TksxS3G+bVNaR+mEY9JJvw/SZVBmYsCRM4OrEkYz1VfvEKDCCt09PVJZKfMw0v0b E8jMKuV3ord+2vAY0CQl96mCLO4FvZylOkMmPmkDEHAda3ek+5ohFmB8JKapH2noYiLQLv vBYzkBXy7z0Him6gWMN31m8sfkAqAGSKGdRTRe0OPS8yytv8HZswlWMOACjlgpVs7I3pnl Zp+5MFDmLDx/27qX5ZCfb//eyX4X1emBVQipRSq+1qZMuR4IvciDF1G8TRNJjQ== 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 4XCmjZ5pq5zd38; Tue, 24 Sep 2024 17:16:18 +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 48OHGIFS093522; Tue, 24 Sep 2024 17:16:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48OHGI1w093519; Tue, 24 Sep 2024 17:16:18 GMT (envelope-from git) Date: Tue, 24 Sep 2024 17:16:18 GMT Message-Id: <202409241716.48OHGI1w093519@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: 80c5d78d90e6 - stable/14 - MFC jail: unbreak the zfs.mount_snapshot option 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/14 X-Git-Reftype: branch X-Git-Commit: 80c5d78d90e65042cf7364b79f5afd3a0509c92e Auto-Submitted: auto-generated The branch stable/14 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=80c5d78d90e65042cf7364b79f5afd3a0509c92e commit 80c5d78d90e65042cf7364b79f5afd3a0509c92e Author: Jamie Gritton AuthorDate: 2024-09-19 19:49:01 +0000 Commit: Jamie Gritton CommitDate: 2024-09-24 17:14:22 +0000 MFC jail: unbreak the zfs.mount_snapshot option The change of its description from integer to boolean didn't actually change it to a boolean, but only made it impossible to set as either a boolean or an integer. Rather than make it work as a boolean parameter should, just revert to the old (working) integer parameter, and change the documentation to match. PR: 274263 Reported by: andrew.hotlab at hotmail (cherry picked from commit ae1a0648b05acf798816e7b83b3c10856de5c8e5) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 2 +- usr.sbin/jail/jail.8 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 9b56d15f1095..a972c720dfdb 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -100,7 +100,7 @@ static struct zfs_jailparam zfs_jailparam0 = { static int zfs_jailparam_slot; SYSCTL_JAIL_PARAM_SYS_NODE(zfs, CTLFLAG_RW, "Jail ZFS parameters"); -SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "B", +SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "I", "Allow mounting snapshots in the .zfs directory for unjailed datasets"); SYSCTL_NODE(_vfs_zfs, OID_AUTO, version, CTLFLAG_RD, 0, "ZFS versions"); diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index 75a0b86eed4c..7fc5357adfd3 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 12, 2024 +.Dd September 19, 2024 .Dt JAIL 8 .Os .Sh NAME @@ -763,8 +763,8 @@ Allow access to SYSV IPC semaphore and shared memory primitives, in the same manner as .Va sysvmsg . .It Va zfs.mount_snapshot -Allow jailed users to access the contents of ZFS snapshots under the -filesystem's +When set to 1, jailed users may access the contents of ZFS snapshots +under the filesystem's .Pa .zfs directory. If