Unverified Commit b9a9be4d authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

smb/client: properly disallow delegations on directories 



The check for S_ISREG() in cifs_setlease() is incorrect since that
operation doesn't get called for directories. The correct way to prevent
delegations on directories is to set the ->setlease() method in directory
file_operations to simple_nosetlease().

Fixes: e6d28ebc ("filelock: push the S_ISREG check down to ->setlease handlers")
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20260107-setlease-6-19-v1-2-85f034abcc57@kernel.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 10dcd511

fs/smb/client/cifsfs.c

+1 −3
Original line number Diff line number Diff line
@@ -1149,9 +1149,6 @@ 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))) ||
@@ -1712,6 +1709,7 @@ const struct file_operations cifs_dir_ops = { 
	.remap_file_range = cifs_remap_file_range,

	.llseek = generic_file_llseek,

	.fsync = cifs_dir_fsync,

	.setlease = simple_nosetlease,

};



static void