提交 b2f3dd05 编写于 作者: M Marc Zyngier 提交者: Yang Yingliang

epoll: Keep a reference on files added to the check list

stable inclusion
from linux-4.19.142
commit 4957d56414ff5ca8fe62f8f11f0f9814f35b1d11
CVE: CVE-2020-0466

--------------------------------

commit a9ed4a65 upstream.

When adding a new fd to an epoll, and that this new fd is an
epoll fd itself, we recursively scan the fds attached to it
to detect cycles, and add non-epool files to a "check list"
that gets subsequently parsed.

However, this check list isn't completely safe when deletions
can happen concurrently. To sidestep the issue, make sure that
a struct file placed on the check list sees its f_count increased,
ensuring that a concurrent deletion won't result in the file
disapearing from under our feet.

Cc: stable@vger.kernel.org
Signed-off-by: NMarc Zyngier <maz@kernel.org>
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NMarc Zyngier <maz@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 50dfd7db
...@@ -1892,11 +1892,13 @@ static int ep_loop_check_proc(void *priv, void *cookie, int call_nests) ...@@ -1892,11 +1892,13 @@ static int ep_loop_check_proc(void *priv, void *cookie, int call_nests)
* not already there, and calling reverse_path_check() * not already there, and calling reverse_path_check()
* 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);
list_add(&epi->ffd.file->f_tfile_llink, list_add(&epi->ffd.file->f_tfile_llink,
&tfile_check_list); &tfile_check_list);
} }
} }
}
mutex_unlock(&ep->mtx); mutex_unlock(&ep->mtx);
return error; return error;
...@@ -1938,6 +1940,7 @@ static void clear_tfile_check_list(void) ...@@ -1938,6 +1940,7 @@ static void clear_tfile_check_list(void)
file = list_first_entry(&tfile_check_list, struct file, file = list_first_entry(&tfile_check_list, struct file,
f_tfile_llink); f_tfile_llink);
list_del_init(&file->f_tfile_llink); list_del_init(&file->f_tfile_llink);
fput(file);
} }
INIT_LIST_HEAD(&tfile_check_list); INIT_LIST_HEAD(&tfile_check_list);
} }
...@@ -2097,9 +2100,11 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, ...@@ -2097,9 +2100,11 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
clear_tfile_check_list(); clear_tfile_check_list();
goto error_tgt_fput; goto error_tgt_fput;
} }
} else } else {
get_file(tf.file);
list_add(&tf.file->f_tfile_llink, list_add(&tf.file->f_tfile_llink,
&tfile_check_list); &tfile_check_list);
}
mutex_lock_nested(&ep->mtx, 0); mutex_lock_nested(&ep->mtx, 0);
if (is_file_epoll(tf.file)) { if (is_file_epoll(tf.file)) {
tep = tf.file->private_data; tep = tf.file->private_data;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册