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

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

Pull fanotify fix from Jan Kara:
 "Fix stale file descriptor in copy_event_to_user"

* tag 'fsnotify_for_v5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fanotify: Fix stale file descriptor in copy_event_to_user()
parents 27bb0b18 ee125951

fs/notify/fanotify/fanotify_user.c

+3 −3
Original line number Diff line number Diff line
@@ -701,9 +701,6 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, 
	if (fanotify_is_perm_event(event->mask))

		FANOTIFY_PERM(event)->fd = fd;



	if (f)

		fd_install(fd, f);



	if (info_mode) {

		ret = copy_info_records_to_user(event, info, info_mode, pidfd,

						buf, count);
@@ -711,6 +708,9 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, 
			goto out_close_fd;

	}



	if (f)

		fd_install(fd, f);



	return metadata.event_len;



out_close_fd: