aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2020-08-22 18:25:52 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-26 10:31:06 +0200
commitdcb6e6efb3298e59d90ee05c6ed33de810314892 (patch)
tree4942b6d4389496c495458f92ed662a7158a979c5
parent4957d56414ff5ca8fe62f8f11f0f9814f35b1d11 (diff)
downloadlinux-yocto-dcb6e6efb3298e59d90ee05c6ed33de810314892.tar.gz
linux-yocto-dcb6e6efb3298e59d90ee05c6ed33de810314892.tar.bz2
linux-yocto-dcb6e6efb3298e59d90ee05c6ed33de810314892.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.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index d804ad60be73..f988ccd064a2 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -2094,10 +2094,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,
@@ -2126,8 +2124,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)
@@ -2150,8 +2146,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: