mirror of
https://github.com/hardkernel/linux.git
synced 2026-03-25 20:10:23 +09:00
ksmbd: use F_SETLK when unlocking a file
[ 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:
committed by
Greg Kroah-Hartman
parent
8263acd267
commit
9ea6b43d8a
@@ -6803,7 +6803,7 @@ static int smb2_set_flock_flags(struct file_lock *flock, int flags)
|
||||
case SMB2_LOCKFLAG_UNLOCK:
|
||||
ksmbd_debug(SMB, "received unlock request\n");
|
||||
flock->fl_type = F_UNLCK;
|
||||
cmd = 0;
|
||||
cmd = F_SETLK;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -7182,7 +7182,7 @@ out:
|
||||
rlock->fl_start = smb_lock->start;
|
||||
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)
|
||||
pr_err("rollback unlock fail : %d\n", rc);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user