summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorASANO Masahiro <masano@tnes.nec.co.jp>2005-12-22 13:24:54 +0900
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-22 09:24:05 -0800
commit0800c5f7a499a8961c3868e95cc4cf1715166457 (patch)
tree609cb9c9cb8e3219722df13907527d3410ae861b /fs
parentd6f029130fb83b36fb709a187275b0494035d689 (diff)
[PATCH] fix posix lock on NFS
NFS client prevents mandatory lock, but there is a flaw on it; Locks are possibly left if the mode is changed while locking. This permits unlocking even if the mandatory lock bits are set. Signed-off-by: ASANO Masahiro <masano@tnes.nec.co.jp> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index eb5cd4c3bbfd..7a79fbe9f539 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -509,7 +509,8 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
return -EINVAL;
/* No mandatory locks over NFS */
- if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
+ if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID &&
+ fl->fl_type != F_UNLCK)
return -ENOLCK;
if (IS_GETLK(cmd))