The patch titled
fcntl_setlease() lockup fix
has been removed from the -mm tree. Its filename is
fcntl_setlease-lockup-fix.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
It is insane to be giving lease_init() the task of freeing the lock it is
supposed to initialise, given that the lock is not guaranteed to be
allocated on the stack. This causes lockups in fcntl_setlease(). Problem
diagnosed by Daniel Hokka Zakrisson <daniel@xxxxxxxxx>
Also fix a slab leak in __setlease() due to an uninitialised return value.
Problem diagnosed by Bjorn Steinbrink.
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Cc: "Dr. J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Cc: "William A. Adamson" <andros@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/locks.c | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff -puN fs/locks.c~fcntl_setlease-lockup-fix fs/locks.c
--- devel/fs/locks.c~fcntl_setlease-lockup-fix 2006-05-11 09:55:59.000000000 -0700
+++ devel-akpm/fs/locks.c 2006-05-11 09:55:59.000000000 -0700
@@ -446,15 +446,14 @@ static struct lock_manager_operations le
*/
static int lease_init(struct file *filp, int type, struct file_lock *fl)
{
+ if (assign_type(fl, type) != 0)
+ return -EINVAL;
+
fl->fl_owner = current->files;
fl->fl_pid = current->tgid;
fl->fl_file = filp;
fl->fl_flags = FL_LEASE;
- if (assign_type(fl, type) != 0) {
- locks_free_lock(fl);
- return -EINVAL;
- }
fl->fl_start = 0;
fl->fl_end = OFFSET_MAX;
fl->fl_ops = NULL;
@@ -466,16 +465,19 @@ static int lease_init(struct file *filp,
static int lease_alloc(struct file *filp, int type, struct file_lock **flp)
{
struct file_lock *fl = locks_alloc_lock();
- int error;
+ int error = -ENOMEM;
if (fl == NULL)
- return -ENOMEM;
+ goto out;
error = lease_init(filp, type, fl);
- if (error)
- return error;
+ if (error) {
+ locks_free_lock(fl);
+ fl = NULL;
+ }
+out:
*flp = fl;
- return 0;
+ return error;
}
/* Check if two locks overlap each other.
@@ -1372,6 +1374,7 @@ static int __setlease(struct file *filp,
goto out;
if (my_before != NULL) {
+ *flp = *my_before;
error = lease->fl_lmops->fl_change(my_before, arg);
goto out;
}
_
Patches currently in -mm which might be from Trond.Myklebust@xxxxxxxxxx are
origin.patch
git-nfs.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
