evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do_epoll_ctl(): clean the failure exits up a bit

Browse source 
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>
This commit is contained in:
Al Viro 2020-08-22 18:25:52 -04:00 • committed by Greg Kroah-Hartman
parent 89077f38db
commit d85e2b0666
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/eventpoll.c
View file

@ -1905,10 +1905,8 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
mutex_lock(&epmutex); mutex_lock(&epmutex);
if (is_file_epoll(tf.file)) { if (is_file_epoll(tf.file)) {
error = -ELOOP; error = -ELOOP;
if (ep_loop_check(ep, tf.file) != 0) { if (ep_loop_check(ep, tf.file) != 0)
clear_tfile_check_list();
goto error_tgt_fput; goto error_tgt_fput;
}
} else { } else {
get_file(tf.file); get_file(tf.file);
list_add(&tf.file->f_tfile_llink, 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); error = ep_insert(ep, &epds, tf.file, fd, full_check);
} else } else
error = -EEXIST; error = -EEXIST;
if (full_check)
clear_tfile_check_list();
break; break;
case EPOLL_CTL_DEL: case EPOLL_CTL_DEL:
if (epi) if (epi)
@ -1959,8 +1955,10 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
mutex_unlock(&ep->mtx); mutex_unlock(&ep->mtx);
error_tgt_fput: error_tgt_fput:
if (full_check) if (full_check) {
clear_tfile_check_list();
mutex_unlock(&epmutex); mutex_unlock(&epmutex);
}
fdput(tf); fdput(tf);
error_fput: error_fput: