NFS: Fix fcntl F_GETLK not reporting some conflicts
Subsystems (2)
PATCH 1/1 NFS: Fix fcntl F_GETLK not reporting some conflicts
The commit 129a84de2347002f09721cda3155ccfd19fade40 (locks: fix F_GETLK regression (failure to find conflicts)) fixed the posix_test_lock() function by itself, however, its usage in NFS changed by the commit 9d6a8c5c213e34c475e72b245a8eb709258e968c (locks: give posix_test_lock same interface as ->lock) remained broken - subsequent NFS-specific locking code received F_UNLCK instead of the user-specified lock type. To fix the problem, fl->fl_type needs to be saved before the posix_test_lock() call and restored if no local conflicts were reported.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=23892
--- fs/nfs/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
There seems to be a similar bug in fs/9p/vfs_file.c:v9fs_file_getlock() and an even worse confusion in fs/afs/flock.c:afs_do_getlk(), but I can't test them.
fs/nfs/file.c +2 -0
@@ -693,6 +693,7 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) {struct inode *inode = filp->f_mapping->host;int status =0 ; +unsigned int saved_type = fl->fl_type;/* Try local locking first */ posix_test_lock (filp, fl);
@@ -700,6 +701,7 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)/* found a conflict */ goto out; } + fl->fl_type = saved_type;if (nfs_have_delegation (inode,FMODE_READ )) goto out_noconflict;
Signature · 1 line
1.7.3.2
Trond Myklebust
AppliedQuoted 34 lines · Sergey Vlasov
The commit
129a84de2347002f09721cda3155ccfd19fade40(locks: fixF_GETLKregression (failure to find conflicts)) fixed theposix_test_lock()function by itself, however, its usage in NFS changed by the commit9d6a8c5c213e34c475e72b245a8eb709258e968c(locks: giveposix_test_locksame interface as ->lock) remained broken - subsequent NFS-specific locking code receivedF_UNLCKinstead of the user-specified lock type. To fix the problem,fl->fl_typeneeds to be saved before theposix_test_lock()call and restored if no local conflicts were reported.Reference: https://bugzilla.kernel.org/show_bug.cgi?id=23892
Tested-by Alexander Morozov <[email protected]>Signed-off-by Sergey Vlasov <[email protected]>Cc <[email protected]>--- fs/nfs/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)There seems to be a similar bug in fs/9p/vfs_file.c:v9fs_file_getlock() and an even worse confusion in fs/afs/flock.c:afs_do_getlk(), but I can't test them.
fs/nfs/file.c +1
-0@@ -693,6 +693,7 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) {struct inode *inode = filp->f_mapping->host;int status =0 ; +unsigned int saved_type = fl->fl_type;/* Try local locking first */ posix_test_lock (filp, fl);
fs/nfs/file.c do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) · line 707
Quoted 7 lines
fs/nfs/file.c +1
-0@@ -700,6 +701,7 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local)/* found a conflict */ goto out; } + fl->fl_type = saved_type;if (nfs_have_delegation (inode,FMODE_READ )) goto out_noconflict;
Thanks! Applied...
Signature · 6 lines
Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com