diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2020-08-22 18:25:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-26 10:27:10 +0200 |
| commit | d85e2b06662e7f46d0f174ecc603fc1c3554d5cf (patch) | |
| tree | ff55fba32a0b92675fdc982366fe1d137f5a780f | |
| parent | 89077f38db728c980dd0cc776400dff5c645f627 (diff) | |
| download | linux-stable-d85e2b06662e7f46d0f174ecc603fc1c3554d5cf.tar.gz linux-stable-d85e2b06662e7f46d0f174ecc603fc1c3554d5cf.tar.bz2 linux-stable-d85e2b06662e7f46d0f174ecc603fc1c3554d5cf.zip | |
do_epoll_ctl(): clean the failure exits up a bit
commit 52c479697c9b73f628140dcdfcd39ea302d05482 upstream.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/eventpoll.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 1a8224709d56..b8959d0d4c72 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1905,10 +1905,8 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, mutex_lock(&epmutex); if (is_file_epoll(tf.file)) { error = -ELOOP; - if (ep_loop_check(ep, tf.file) != 0) { - clear_tfile_check_list(); + if (ep_loop_check(ep, tf.file) != 0) goto error_tgt_fput; - } } else { get_file(tf.file); list_add(&tf.file->f_tfile_llink, @@ -1937,8 +1935,6 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, error = ep_insert(ep, &epds, tf.file, fd, full_check); } else error = -EEXIST; - if (full_check) - clear_tfile_check_list(); break; case EPOLL_CTL_DEL: if (epi) @@ -1959,8 +1955,10 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, mutex_unlock(&ep->mtx); error_tgt_fput: - if (full_check) + if (full_check) { + clear_tfile_check_list(); mutex_unlock(&epmutex); + } fdput(tf); error_fput: |