Commit d66fd908 authored by Amy Griffis's avatar Amy Griffis Committed by Linus Torvalds
Browse files

[PATCH] fix NULL dereference in inotify_ignore 



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

Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
Cc: John McCutchan <john@johnmccutchan.com>
Cc: Robert Love <rlove@rlove.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 66055a4e

fs/inotify.c

+1 −2
Original line number Diff line number Diff line
@@ -894,8 +894,7 @@ static int inotify_ignore(struct inotify_device *dev, s32 wd) 
	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);