mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 16:07:39 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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"
This commit is contained in:
Linus Torvalds 2020-09-02 11:29:34 -07:00
commit 54e54d5818
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/eventpoll.c
View file

@ -1995,9 +1995,9 @@ static int ep_loop_check_proc(void *priv, void *cookie, int call_nests)
* during ep_insert(). * during ep_insert().
*/ */
if (list_empty(&epi->ffd.file->f_tfile_llink)) { 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, list_add(&epi->ffd.file->f_tfile_llink,
&tfile_check_list); &tfile_check_list);
} }
} }
} }