epoll: do not insert into poll queues until all sanity checks are done
Subsystems (2)
Sasha Levin
maintainerPATCH 1/1 epoll: do not insert into poll queues until all sanity checks are done
From: Al Viro <[email protected]>
[ Upstream commit f8d4f44df056c5b504b0d49683fb7279218fd207 ]
Signed-off-by Al Viro <[email protected]>
Signed-off-by Sasha Levin <[email protected]>
--- fs/eventpoll.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-)
fs/eventpoll.c +18 -19
@@ -1304,6 +1304,22 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,RCU_INIT_POINTER (epi->ws,NULL ); } +/* Add the current item to the list of active epoll hook for this file */ +spin_lock (&tfile->f_lock); +list_add_tail_rcu (&epi->fllink, &tfile->f_ep_links); +spin_unlock (&tfile->f_lock); + +/* +* Add the current item to the RB tree. All RB tree operations are +* protected by "mtx", and ep_insert() is called with "mtx" held. +*/ +ep_rbtree_insert (ep, epi); + +/* now check if we've created too many backpaths */ + error = -EINVAL ; +if (full_check &&reverse_path_check ()) + goto error_remove_epi; +/* Initialize the poll table using the queue callback */ epq.epi = epi;init_poll_funcptr (&epq.pt, ep_ptable_queue_proc);
@@ -1326,22 +1342,6 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,if (epi->nwait <0 ) goto error_unregister; -/* Add the current item to the list of active epoll hook for this file */ -spin_lock (&tfile->f_lock); -list_add_tail_rcu (&epi->fllink, &tfile->f_ep_links); -spin_unlock (&tfile->f_lock); - -/* -* Add the current item to the RB tree. All RB tree operations are -* protected by "mtx", and ep_insert() is called with "mtx" held. -*/ -ep_rbtree_insert (ep, epi); - -/* now check if we've created too many backpaths */ - error = -EINVAL ; -if (full_check &&reverse_path_check ()) - goto error_remove_epi; -/* We have to drop the new item inside our item list to keep track of it */ spin_lock_irqsave (&ep->lock, flags);
@@ -1367,6 +1367,8 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,return 0 ; +error_unregister: +ep_unregister_pollwait (ep, epi); error_remove_epi:spin_lock (&tfile->f_lock);list_del_rcu (&epi->fllink);
@@ -1374,9 +1376,6 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,rb_erase (&epi->rbn, &ep->rbr); -error_unregister: -ep_unregister_pollwait (ep, epi); -/* * We need to do this because an event could have been arrived on some * allocated wait queue. Note that we don't care about the ep->ovflist
Signature · 1 line
2.25.1