Skip to contentSkip to conversation

fix NULL dereference in inotify_ignore

PATCH New Amy Griffis 1 participant 1 message May 20, 2006 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix NULL dereference in inotify_ignore

Don't reassign to watch. If idr_find() returns NULL, then put_inotify_watch will choke.

fs/inotify.c +1 -2
index 7d57253..5d4ba7c 100644
@@ -889,18 +889,17 @@ static int inotify_ignore(struct inotify
 	get_inotify_watch(watch);
 	inode = watch->inode;
 	mutex_unlock(&dev->mutex);
 
 	mutex_lock(&inode->inotify_mutex);
 	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);
 	mutex_unlock(&inode->inotify_mutex);
 	put_inotify_watch(watch);
 
 	return 0;
 }