From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 597E3224245; Mon, 2 Jun 2025 14:02:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872944; cv=none; b=pyQ+/S/TOtnpp09KhNyWBXNrUGJDaLXQDXcuwfggbJ+uO9yJNKNIASPZ1w5JXotCA2wMDdhhlDGQk31ZNlNPR288Dc5jxYzdE3myiuAj1DwPnp5IvDTjaN8iq2DkPjxBIB7y9rmQ6YpsH4qozYWzin/qpcyvX1dNMYIgk8G92MY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748872944; c=relaxed/simple; bh=ZrFup30IUUI62IhIRTGdtQyA3ni1qkUHKiEvsunwAIc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jBpzpBggOeVtG9BEyXo+UTaesmJ29TvUwCTrkbNHcpZq3OTtMNzROCTQDcNWWbjbJyh9wwa2zTwEke2z8HVnzmk7gNrBO3/zvjFjQoMSbzvtxOi++dGSWgoBSkyyuWDYOnZdGwASjho5bdkvJ0Wt2++IYdBt1gtQFd5Mhg2xQsc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bOllxQD0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bOllxQD0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3ACF1C4CEF5; Mon, 2 Jun 2025 14:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748872944; bh=ZrFup30IUUI62IhIRTGdtQyA3ni1qkUHKiEvsunwAIc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bOllxQD0QutP185Tx+5m080NYaVFu/O8IYq4VMDolty/P/OSOenm0IFy/5qjX2YH1 YgAmwfzQUR3pN1VHhT5OP1ESmeA1tz9QLmLiauh8CC7OjrwJCwAqXlWaMYjOtZTXpi 8mXs4qcJncvNH3LyKlPiZydfldKGUEl1qJQ34tEe7EdCu3nYG8Klv6oq0AjuvsyEWW W0xt5u/THz5svq3SMg/YUAZAreWLy+SS12qq3oERDKZDrG6F3N5qiNBNcQDoN8+R2Z GPnFJx0s+wWszvs43irEtRrB6utXaGwtgsQMhvZ8VtB+Tsq1cYiPjCUGHuoESr2cSR YUf7p3u9/4Ucw== From: Jeff Layton Date: Mon, 02 Jun 2025 10:01:44 -0400 Subject: [PATCH RFC v2 01/28] filelock: push the S_ISREG check down to ->setlease handlers Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250602-dir-deleg-v2-1-a7919700de86@kernel.org> References: <20250602-dir-deleg-v2-0-a7919700de86@kernel.org> In-Reply-To: <20250602-dir-deleg-v2-0-a7919700de86@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Chuck Lever , Alexander Aring , Trond Myklebust , Anna Schumaker , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , Bharath SM , NeilBrown , Olga Kornievskaia , Dai Ngo , Jonathan Corbet , Amir Goldstein , Miklos Szeredi Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3149; i=jlayton@kernel.org; h=from:subject:message-id; bh=ZrFup30IUUI62IhIRTGdtQyA3ni1qkUHKiEvsunwAIc=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoPa7kbGXbFK+2MezlY3MJ/Xtzr/ggiQYYbxlfc LXfkYQCqF+JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaD2u5AAKCRAADmhBGVaC FbHvD/9vSTVF8NJ7ALqyShqeu2mSuoidlK+DgJlsHzCpSFoJ4QmMFY53YntfUE6tg4GYQgGRxv6 eL8ix5GzWuQCu/aZ9F5Fpno+yDZ9DbZPumGZDUQy3pWpfSfeiqtV648XILPtQMZdzH6l75LVnut 4DrL0vRNg4UTjJP4hHXTKrt6O1hYmX3XNlyk6m24CMa/Pv9D/hVoOk1h7Q6EUyG8Gq6BsY5uIyT 0z1KH1Ok5xg9uj1Xj5RyB4N2lHrBMbucFWTh74ug0L2ebnKve7dh/WiIQgpTaf8L3AQ7yHj5OrA Or+8t0/98p1RRVq57i/uShY7+gMgzLPBzJSq6kMVDaMODvfcTLY09XMYypKTDEN2etAifXPTz7/ kgLw7P2IVuME5DpLTXpH7VGyod/qbu+f/lu05uBLf7z+gexzz6Xesf6eHkIenCDJ0JBTX33GHmg Lb7hazPie+DtN0CWxTBzjzB6HqeOq9xgh0VNEI5MemTkcCgsnidLu/UebrKhhqHOfvsqvk160pV hFSUV9a9+FLTcLFebW5qAclhoKvi9oWOvby2qoQCwyNpqly+NJEkzwu3sYwjlenXz2bHspYTYsc 7x2I3jSCyKW7eN7Gecmy4Wgf6okjfult8w114tBEVjgLSGyC38PNSiukTa+C/k9mOMdjMZbvfQC /n5RRBGG/tMRkHw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 When nfsd starts requesting directory delegations, setlease handlers may see requests for leases on directories. Push the !S_ISREG check down into the non-trivial setlease handlers, so we can selectively enable them where they're supported. FUSE is specialr:. It's the only filesystem that supports atomic_open and allow kernel-internal leases. Ensure that we don't allow directory leases by default going forward by explicitly disabling them there. Signed-off-by: Jeff Layton --- fs/fuse/dir.c | 1 + fs/locks.c | 5 +++-- fs/nfs/nfs4file.c | 2 ++ fs/smb/client/cifsfs.c | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 33b82529cb6e4bffa607e1b20bd09ac489b0667f..c83e61b52e0fff106ef2a3d62efcc3949ccf39e7 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -2218,6 +2218,7 @@ static const struct file_operations fuse_dir_operations = { .fsync = fuse_dir_fsync, .unlocked_ioctl = fuse_dir_ioctl, .compat_ioctl = fuse_dir_compat_ioctl, + .setlease = simple_nosetlease, }; static const struct inode_operations fuse_common_inode_operations = { diff --git a/fs/locks.c b/fs/locks.c index 1619cddfa7a4d799f0f84f0bc8f28458d8d280db..a35d033dcaf0b604b73395260562af08f7711c12 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1929,6 +1929,9 @@ static int generic_delete_lease(struct file *filp, void *owner) int generic_setlease(struct file *filp, int arg, struct file_lease **flp, void **priv) { + if (!S_ISREG(file_inode(filp)->i_mode)) + return -EINVAL; + switch (arg) { case F_UNLCK: return generic_delete_lease(filp, *priv); @@ -2018,8 +2021,6 @@ vfs_setlease(struct file *filp, int arg, struct file_lease **lease, void **priv) if ((!vfsuid_eq_kuid(vfsuid, current_fsuid())) && !capable(CAP_LEASE)) return -EACCES; - if (!S_ISREG(inode->i_mode)) - return -EINVAL; error = security_file_lock(filp, arg); if (error) return error; diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 1cd9652f3c280358209f22503ea573a906a6194e..b7630a437ad22fbfb658086953b25b9ae6b4f057 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -442,6 +442,8 @@ void nfs42_ssc_unregister_ops(void) static int nfs4_setlease(struct file *file, int arg, struct file_lease **lease, void **priv) { + if (!S_ISREG(file_inode(file)->i_mode)) + return -EINVAL; return nfs4_proc_setlease(file, arg, lease, priv); } diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c index fb04e263611cadaea210f5c1d90c05bea37fb496..991583b0b77e480c002974b410f06853740e4b1b 100644 --- a/fs/smb/client/cifsfs.c +++ b/fs/smb/client/cifsfs.c @@ -1094,6 +1094,9 @@ cifs_setlease(struct file *file, int arg, struct file_lease **lease, void **priv struct inode *inode = file_inode(file); struct cifsFileInfo *cfile = file->private_data; + if (!S_ISREG(inode->i_mode)) + return -EINVAL; + /* Check if file is oplocked if this is request for new lease */ if (arg == F_UNLCK || ((arg == F_RDLCK) && CIFS_CACHE_READ(CIFS_I(inode))) || -- 2.49.0