Commit dcb6e6ef authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman

do_epoll_ctl(): clean the failure exits up a bit

commit 52c47969 upstream.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4957d564
...@@ -2094,10 +2094,8 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, ...@@ -2094,10 +2094,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,
...@@ -2126,8 +2124,6 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, ...@@ -2126,8 +2124,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)
...@@ -2150,8 +2146,10 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, ...@@ -2150,8 +2146,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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment