Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a719cbe0 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Greg Kroah-Hartman
Browse files

inotify: Fix fd refcount leak in inotify_add_watch(). 



commit 125892edfe69915a227d8d125ff0e1cd713178f4 upstream.

Commit 4d97f7d5 ("inotify: Add flag IN_MASK_CREATE for
inotify_add_watch()") forgot to call fdput() before bailing out.

Fixes: 4d97f7d5 ("inotify: Add flag IN_MASK_CREATE for inotify_add_watch()")
CC: stable@vger.kernel.org
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent afb4a7ca

fs/notify/inotify/inotify_user.c

+4 −2
Original line number Diff line number Diff line
@@ -724,8 +724,10 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname, 
		return -EBADF;



	/* IN_MASK_ADD and IN_MASK_CREATE don't make sense together */

	if (unlikely((mask & IN_MASK_ADD) && (mask & IN_MASK_CREATE)))

		return -EINVAL;

	if (unlikely((mask & IN_MASK_ADD) && (mask & IN_MASK_CREATE))) {

		ret = -EINVAL;

		goto fput_and_out;

	}



	/* verify that this is indeed an inotify instance */

	if (unlikely(f.file->f_op != &inotify_fops)) {