The patch titled
fix race in inotify_release
has been removed from the -mm tree. Its filename is
fix-race-in-inotify_release.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.
------------------------------------------------------
Subject: fix race in inotify_release
From: Amy Griffis <amy.griffis@xxxxxx>
While doing some inotify stress testing, I hit the following race. In
inotify_release(), it's possible for a watch to be removed from the lists
in between dropping dev->mutex and taking inode->inotify_mutex. The
reference we hold prevents the watch from being freed, but not from being
removed.
Checking the dev's idr mapping will prevent a double list_del of the
same watch.
Signed-off-by: Amy Griffis <amy.griffis@xxxxxx>
Acked-by: John McCutchan <john@xxxxxxxxxxxxxxxxx>
Cc: Robert Love <rml@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/inotify.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletion(-)
diff -puN fs/inotify.c~fix-race-in-inotify_release fs/inotify.c
--- devel/fs/inotify.c~fix-race-in-inotify_release 2006-05-20 14:59:35.000000000 -0700
+++ devel-akpm/fs/inotify.c 2006-05-20 14:59:35.000000000 -0700
@@ -848,7 +848,11 @@ static int inotify_release(struct inode
inode = watch->inode;
mutex_lock(&inode->inotify_mutex);
mutex_lock(&dev->mutex);
- remove_watch_no_event(watch, dev);
+
+ /* make sure we didn't race with another list removal */
+ if (likely(idr_find(&dev->idr, watch->wd)))
+ remove_watch_no_event(watch, dev);
+
mutex_unlock(&dev->mutex);
mutex_unlock(&inode->inotify_mutex);
put_inotify_watch(watch);
_
Patches currently in -mm which might be from amy.griffis@xxxxxx are
origin.patch
git-audit-master.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
