Commit 54e54d58 authored Sep 02, 2020 by Linus Torvalds

Merge branch 'work.epoll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull epoll fixup from Al Viro:
 "Fixup for epoll regression; there's a better solution longer term, but
  this is the least intrusive fix"

* 'work.epoll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix regression in "epoll: Keep a reference on files added to the check list"

parents 9c7d619b 77f4689d

fs/eventpoll.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1995,7 +1995,7 @@ static int ep_loop_check_proc(void priv, void cookie, int call_nests)
		* during ep_insert().
		*/
		if (list_empty(&epi->ffd.file->f_tfile_llink)) {
		get_file(epi->ffd.file);
		if (get_file_rcu(epi->ffd.file))
		list_add(&epi->ffd.file->f_tfile_llink,
		&tfile_check_list);
		}

Admin message