linux-kernel - [PATCH 23/24] filelock: default to returning -EINVAL when ->setlease operation is NULL

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20260108-setlease-6-20-v1-23-ea4dec9b67fa@kernel.org>
Date: Thu, 08 Jan 2026 12:13:18 -0500
From: Jeff Layton <jlayton@...nel.org>
To: Luis de Bethencourt <luisbg@...nel.org>, 
 Salah Triki <salah.triki@...il.com>, Nicolas Pitre <nico@...xnic.net>, 
 Christoph Hellwig <hch@...radead.org>, Jan Kara <jack@...e.cz>, 
 Anders Larsen <al@...rsen.net>, Alexander Viro <viro@...iv.linux.org.uk>, 
 Christian Brauner <brauner@...nel.org>, David Sterba <dsterba@...e.com>, 
 Chris Mason <clm@...com>, Gao Xiang <xiang@...nel.org>, 
 Chao Yu <chao@...nel.org>, Yue Hu <zbestahu@...il.com>, 
 Jeffle Xu <jefflexu@...ux.alibaba.com>, 
 Sandeep Dhavale <dhavale@...gle.com>, Hongbo Li <lihongbo22@...wei.com>, 
 Chunhai Guo <guochunhai@...o.com>, Jan Kara <jack@...e.com>, 
 Theodore Ts'o <tytso@....edu>, Andreas Dilger <adilger.kernel@...ger.ca>, 
 Jaegeuk Kim <jaegeuk@...nel.org>, 
 OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>, 
 David Woodhouse <dwmw2@...radead.org>, Richard Weinberger <richard@....at>, 
 Dave Kleikamp <shaggy@...nel.org>, 
 Ryusuke Konishi <konishi.ryusuke@...il.com>, 
 Viacheslav Dubeyko <slava@...eyko.com>, 
 Konstantin Komarov <almaz.alexandrovich@...agon-software.com>, 
 Mark Fasheh <mark@...heh.com>, Joel Becker <jlbec@...lplan.org>, 
 Joseph Qi <joseph.qi@...ux.alibaba.com>, 
 Mike Marshall <hubcap@...ibond.com>, 
 Martin Brandenburg <martin@...ibond.com>, 
 Miklos Szeredi <miklos@...redi.hu>, Amir Goldstein <amir73il@...il.com>, 
 Phillip Lougher <phillip@...ashfs.org.uk>, Carlos Maiolino <cem@...nel.org>, 
 Hugh Dickins <hughd@...gle.com>, 
 Baolin Wang <baolin.wang@...ux.alibaba.com>, 
 Andrew Morton <akpm@...ux-foundation.org>, 
 Namjae Jeon <linkinjeon@...nel.org>, Sungjong Seo <sj1557.seo@...sung.com>, 
 Yuezhang Mo <yuezhang.mo@...y.com>, Chuck Lever <chuck.lever@...cle.com>, 
 Alexander Aring <alex.aring@...il.com>, 
 Andreas Gruenbacher <agruenba@...hat.com>, Jonathan Corbet <corbet@....net>, 
 "Matthew Wilcox (Oracle)" <willy@...radead.org>, 
 Eric Van Hensbergen <ericvh@...nel.org>, 
 Latchesar Ionkov <lucho@...kov.net>, 
 Dominique Martinet <asmadeus@...ewreck.org>, 
 Christian Schoenebeck <linux_oss@...debyte.com>, 
 Xiubo Li <xiubli@...hat.com>, Ilya Dryomov <idryomov@...il.com>, 
 Trond Myklebust <trondmy@...nel.org>, Anna Schumaker <anna@...nel.org>, 
 Steve French <sfrench@...ba.org>, Paulo Alcantara <pc@...guebit.org>, 
 Ronnie Sahlberg <ronniesahlberg@...il.com>, 
 Shyam Prasad N <sprasad@...rosoft.com>, Tom Talpey <tom@...pey.com>, 
 Bharath SM <bharathsm@...rosoft.com>, Hans de Goede <hansg@...nel.org>
Cc: linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org, 
 linux-btrfs@...r.kernel.org, linux-erofs@...ts.ozlabs.org, 
 linux-ext4@...r.kernel.org, linux-f2fs-devel@...ts.sourceforge.net, 
 linux-mtd@...ts.infradead.org, jfs-discussion@...ts.sourceforge.net, 
 linux-nilfs@...r.kernel.org, ntfs3@...ts.linux.dev, 
 ocfs2-devel@...ts.linux.dev, devel@...ts.orangefs.org, 
 linux-unionfs@...r.kernel.org, linux-xfs@...r.kernel.org, 
 linux-mm@...ck.org, gfs2@...ts.linux.dev, linux-doc@...r.kernel.org, 
 v9fs@...ts.linux.dev, ceph-devel@...r.kernel.org, linux-nfs@...r.kernel.org, 
 linux-cifs@...r.kernel.org, samba-technical@...ts.samba.org, 
 Jeff Layton <jlayton@...nel.org>
Subject: [PATCH 23/24] filelock: default to returning -EINVAL when
 ->setlease operation is NULL

Now that most filesystems where we expect to need lease support have
their ->setlease() operations explicitly set, change kernel_setlease()
to return -EINVAL when the setlease is a NULL pointer.

Also update the Documentation/ with info about this change.

Signed-off-by: Jeff Layton <jlayton@...nel.org>
---
 Documentation/filesystems/porting.rst | 9 +++++++++
 Documentation/filesystems/vfs.rst     | 9 ++++++---
 fs/locks.c                            | 3 +--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst
index 3397937ed838e5e7dfacc6379a9d71481cc30914..c0f7103628ab5ed70d142a5c7f6d95ca4734c741 100644
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@ -1334,3 +1334,12 @@ end_creating() and the parent will be unlocked precisely when necessary.
 
 kill_litter_super() is gone; convert to DCACHE_PERSISTENT use (as all
 in-tree filesystems have done).
+
+---
+
+**mandatory**
+
+The ->setlease() file_operation must now be explicitly set in order to provide
+support for leases. When set to NULL, the kernel will now return -EINVAL to
+attempts to set a lease. Filesystems that wish to use the kernel-internal lease
+implementation should set it to generic_setlease().
diff --git a/Documentation/filesystems/vfs.rst b/Documentation/filesystems/vfs.rst
index 670ba66b60e4964927164a57e68adc0edfc681ee..21dc8921dd9ebedeafc4c108de7327f172138b6e 100644
--- a/Documentation/filesystems/vfs.rst
+++ b/Documentation/filesystems/vfs.rst
@@ -1180,9 +1180,12 @@ otherwise noted.
 	method is used by the splice(2) system call
 
 ``setlease``
-	called by the VFS to set or release a file lock lease.  setlease
-	implementations should call generic_setlease to record or remove
-	the lease in the inode after setting it.
+	called by the VFS to set or release a file lock lease.  Local
+	filesystems that wish to use the kernel-internal lease implementation
+	should set this to generic_setlease(). Other setlease implementations
+	should call generic_setlease() to record or remove the lease in the inode
+	after setting it. When set to NULL, attempts to set or remove a lease will
+	return -EINVAL.
 
 ``fallocate``
 	called by the VFS to preallocate blocks or punch a hole.
diff --git a/fs/locks.c b/fs/locks.c
index e2036aa4bd3734be415296f9157d8f17166878aa..ea38a18f373c2202ba79e8e37125f8d32a0e2d42 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2016,8 +2016,7 @@ kernel_setlease(struct file *filp, int arg, struct file_lease **lease, void **pr
 		setlease_notifier(arg, *lease);
 	if (filp->f_op->setlease)
 		return filp->f_op->setlease(filp, arg, lease, priv);
-	else
-		return generic_setlease(filp, arg, lease, priv);
+	return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(kernel_setlease);
 

-- 
2.52.0