The patch titled
fix NULL dereference in inotify_ignore
has been removed from the -mm tree. Its filename is
fix-null-dereference-in-inotify_ignore.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 NULL dereference in inotify_ignore
From: Amy Griffis <amy.griffis@xxxxxx>
Don't reassign to watch. If idr_find() returns NULL, then
put_inotify_watch() will choke.
Signed-off-by: Amy Griffis <amy.griffis@xxxxxx>
Cc: John McCutchan <john@xxxxxxxxxxxxxxxxx>
Cc: Robert Love <rlove@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/inotify.c | 3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
diff -puN fs/inotify.c~fix-null-dereference-in-inotify_ignore fs/inotify.c
--- devel/fs/inotify.c~fix-null-dereference-in-inotify_ignore 2006-05-20 14:59:35.000000000 -0700
+++ devel-akpm/fs/inotify.c 2006-05-20 14:59:35.000000000 -0700
@@ -894,8 +894,7 @@ static int inotify_ignore(struct inotify
mutex_lock(&dev->mutex);
/* make sure that we did not race */
- watch = idr_find(&dev->idr, wd);
- if (likely(watch))
+ if (likely(idr_find(&dev->idr, wd) == watch))
remove_watch(watch, dev);
mutex_unlock(&dev->mutex);
_
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
