shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

ksmbd: use F_SETLK when unlocking a file

Browse Source 
[ Upstream commit 7ecbe92696 ]

ksmbd seems to be trying to use a cmd value of 0 when unlocking a file.
That activity requires a type of F_UNLCK with a cmd of F_SETLK. For
local POSIX locking, it doesn't matter much since vfs_lock_file ignores
@cmd, but filesystems that define their own ->lock operation expect to
see it set sanely.

Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: David Howells <dhowells@redhat.com>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jeff Layton
2023-12-19 00:33:26 +09:00
committed by Greg Kroah-Hartman
parent 8263acd267
commit 9ea6b43d8a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ksmbd/smb2pdu.c
View File

@@ -6803,7 +6803,7 @@ static int smb2_set_flock_flags(struct file_lock *flock, int flags)
case SMB2_LOCKFLAG_UNLOCK: case SMB2_LOCKFLAG_UNLOCK:
ksmbd_debug(SMB, "received unlock request\n"); ksmbd_debug(SMB, "received unlock request\n");
flock->fl_type = F_UNLCK; flock->fl_type = F_UNLCK;
cmd = 0; cmd = F_SETLK;
break; break;
} }
@@ -7182,7 +7182,7 @@ out:
rlock->fl_start = smb_lock->start; rlock->fl_start = smb_lock->start;
rlock->fl_end = smb_lock->end; rlock->fl_end = smb_lock->end;
rc = vfs_lock_file(filp, 0, rlock, NULL); rc = vfs_lock_file(filp, F_SETLK, rlock, NULL);
if (rc) if (rc)
pr_err("rollback unlock fail : %d\n", rc); pr_err("rollback unlock fail : %d\n", rc);