VFS,fs/locks.c,NFSD4: add race_free posix_lock_file_conf() interface
Subsystems (2)
Author: Andy Adamson <[email protected]>
Lockd and the NFSv4 server both exercise a race condition where posix_test_lock() is called either before or after posix_lock_file() to deal with a denied lock request due to a conflicting lock.
Remove the race condition for the NFSv4 server by adding a new conflicting lock parameter to __posix_lock_file() , changing the name to __posix_lock_file_conf().
Keep posix_lock_file() interface, add posix_lock_conf() interface, both call __posix_lock_file_conf().
---
fs/locks.c | 28 ++++++++++++++++++++++------ include/linux/fs.h | 1 + 2 files changed, 23 insertions(+), 6 deletions(-)
fs/locks.c +22 -6
@@ -798,8 +798,9 @@ out: }EXPORT_SYMBOL (posix_lock_file); +EXPORT_SYMBOL (posix_lock_file_conf); -static int __posix_lock_file (struct inode *inode,struct file_lock *request) +static int __posix_lock_file_conf (struct inode *inode,struct file_lock *request,struct file_lock *conflock) {struct file_lock *fl;struct file_lock *new_fl, *new_fl2;
@@ -823,6 +824,8 @@ static int __posix_lock_file(struct inodcontinue ;if (!posix_locks_conflict (request, fl))continue ; +if (conflock) +locks_copy_lock (conflock, fl); error = -EAGAIN ;if (!(request->fl_flags &FL_SLEEP )) goto out;
@@ -992,7 +995,20 @@ static int __posix_lock_file(struct inod*/ int posix_lock_file (struct file *filp,struct file_lock *fl) { -return __posix_lock_file (filp->f_dentry->d_inode, fl); +return __posix_lock_file_conf (filp->f_dentry->d_inode, fl,NULL ); +} + +/** +* posix_lock_file_conf - Apply a POSIX-style lock to a file +* @filp: The file to apply the lock to +* @fl: The lock to be applied +* @conflock: Place to return a copy of the conflicting lock, if found. +* +* Except for the conflock parameter, acts just like posix_lock_file. +*/ +int posix_lock_file_conf (struct file *filp,struct file_lock *fl,struct file_lock *conflock) +{ +return __posix_lock_file_conf (filp->f_dentry->d_inode, fl, conflock); }/**
@@ -1009,7 +1025,7 @@ int posix_lock_file_wait(struct file *fiint error;might_sleep ();for (;;) { - error =__posix_lock_file (filp->f_dentry->d_inode, fl); + error =posix_lock_file (filp, fl);if ((error != -EAGAIN ) || !(fl->fl_flags &FL_SLEEP ))break ; error =wait_event_interruptible (fl->fl_wait, !fl->fl_next);
@@ -1081,7 +1097,7 @@ int locks_mandatory_area(int read_write, fl.fl_end = offset + count -1 ;for (;;) { - error =__posix_lock_file (inode, &fl); + error =__posix_lock_file_conf (inode, &fl,NULL );if (error != -EAGAIN )break ;if (!(fl.fl_flags &FL_SLEEP ))
@@ -1694,7 +1710,7 @@ again: error = filp->f_op->lock (filp, cmd, file_lock); else {for (;;) { - error =__posix_lock_file (inode, file_lock); + error =posix_lock_file (filp, file_lock);if ((error != -EAGAIN ) || (cmd ==F_SETLK ))break ; error = wait_event_interruptible(file_lock->fl_wait,
@@ -1837,7 +1853,7 @@ again: error = filp->f_op->lock (filp, cmd, file_lock); else {for (;;) { - error =__posix_lock_file (inode, file_lock); + error =posix_lock_file (filp, file_lock);if ((error != -EAGAIN ) || (cmd ==F_SETLK64 ))break ; error = wait_event_interruptible(file_lock->fl_wait,
include/linux/fs.h +1 -0
@@ -752,6 +752,7 @@ extern void locks_copy_lock(struct file_extern void locks_remove_posix (struct file *,fl_owner_t );extern void locks_remove_flock (struct file *);extern int posix_test_lock (struct file *,struct file_lock *,struct file_lock *); +extern int posix_lock_file_conf (struct file *,struct file_lock *,struct file_lock *);extern int posix_lock_file (struct file *,struct file_lock *);extern int posix_lock_file_wait (struct file *,struct file_lock *);extern int posix_unblock_lock (struct file *,struct file_lock *);
Quoted 2 lines · Trond Myklebust
Author: Andy Adamson <[email protected]>
Oops... That should have been "From: Andy Adamson", shouldn't it.
Sorry. I'll resend that one...
Cheers,
Trond
From: Andy Adamson <[email protected]>
Lockd and the NFSv4 server both exercise a race condition where posix_test_lock() is called either before or after posix_lock_file() to deal with a denied lock request due to a conflicting lock.
Remove the race condition for the NFSv4 server by adding a new conflicting lock parameter to __posix_lock_file() , changing the name to __posix_lock_file_conf().
Keep posix_lock_file() interface, add posix_lock_conf() interface, both call __posix_lock_file_conf().
---
fs/locks.c | 28 ++++++++++++++++++++++------ include/linux/fs.h | 1 + 2 files changed, 23 insertions(+), 6 deletions(-)
fs/locks.c +22 -6
@@ -798,8 +798,9 @@ out: }EXPORT_SYMBOL (posix_lock_file); +EXPORT_SYMBOL (posix_lock_file_conf); -static int __posix_lock_file (struct inode *inode,struct file_lock *request) +static int __posix_lock_file_conf (struct inode *inode,struct file_lock *request,struct file_lock *conflock) {struct file_lock *fl;struct file_lock *new_fl, *new_fl2;
@@ -823,6 +824,8 @@ static int __posix_lock_file(struct inodcontinue ;if (!posix_locks_conflict (request, fl))continue ; +if (conflock) +locks_copy_lock (conflock, fl); error = -EAGAIN ;if (!(request->fl_flags &FL_SLEEP )) goto out;
@@ -992,7 +995,20 @@ static int __posix_lock_file(struct inod*/ int posix_lock_file (struct file *filp,struct file_lock *fl) { -return __posix_lock_file (filp->f_dentry->d_inode, fl); +return __posix_lock_file_conf (filp->f_dentry->d_inode, fl,NULL ); +} + +/** +* posix_lock_file_conf - Apply a POSIX-style lock to a file +* @filp: The file to apply the lock to +* @fl: The lock to be applied +* @conflock: Place to return a copy of the conflicting lock, if found. +* +* Except for the conflock parameter, acts just like posix_lock_file. +*/ +int posix_lock_file_conf (struct file *filp,struct file_lock *fl,struct file_lock *conflock) +{ +return __posix_lock_file_conf (filp->f_dentry->d_inode, fl, conflock); }/**
@@ -1009,7 +1025,7 @@ int posix_lock_file_wait(struct file *fiint error;might_sleep ();for (;;) { - error =__posix_lock_file (filp->f_dentry->d_inode, fl); + error =posix_lock_file (filp, fl);if ((error != -EAGAIN ) || !(fl->fl_flags &FL_SLEEP ))break ; error =wait_event_interruptible (fl->fl_wait, !fl->fl_next);
@@ -1081,7 +1097,7 @@ int locks_mandatory_area(int read_write, fl.fl_end = offset + count -1 ;for (;;) { - error =__posix_lock_file (inode, &fl); + error =__posix_lock_file_conf (inode, &fl,NULL );if (error != -EAGAIN )break ;if (!(fl.fl_flags &FL_SLEEP ))
@@ -1694,7 +1710,7 @@ again: error = filp->f_op->lock (filp, cmd, file_lock); else {for (;;) { - error =__posix_lock_file (inode, file_lock); + error =posix_lock_file (filp, file_lock);if ((error != -EAGAIN ) || (cmd ==F_SETLK ))break ; error = wait_event_interruptible(file_lock->fl_wait,
@@ -1837,7 +1853,7 @@ again: error = filp->f_op->lock (filp, cmd, file_lock); else {for (;;) { - error =__posix_lock_file (inode, file_lock); + error =posix_lock_file (filp, file_lock);if ((error != -EAGAIN ) || (cmd ==F_SETLK64 ))break ; error = wait_event_interruptible(file_lock->fl_wait,
include/linux/fs.h +1 -0
@@ -752,6 +752,7 @@ extern void locks_copy_lock(struct file_extern void locks_remove_posix (struct file *,fl_owner_t );extern void locks_remove_flock (struct file *);extern int posix_test_lock (struct file *,struct file_lock *,struct file_lock *); +extern int posix_lock_file_conf (struct file *,struct file_lock *,struct file_lock *);extern int posix_lock_file (struct file *,struct file_lock *);extern int posix_lock_file_wait (struct file *,struct file_lock *);extern int posix_unblock_lock (struct file *,struct file_lock *);