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

Commit c04e2a78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fsnotify_for_v5.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull inotify fix from Jan Kara:
 "Fix a file refcount leak in an inotify error path"

* tag 'fsnotify_for_v5.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  inotify: Fix fd refcount leak in inotify_add_watch().
parents 22a89a6b 125892ed

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)) {