diff --git a/[refs] b/[refs] index cbd430f24af9..71c22768bc68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abff55cee1039b5a3b96f7a5eb6e65b9f247a274 +refs/heads/master: d0305882825784e74f68a56eee6c3a812a99f235 diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c index db4365f8a75c..c806a0c4383c 100644 --- a/trunk/fs/eventpoll.c +++ b/trunk/fs/eventpoll.c @@ -1054,8 +1054,10 @@ static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head, */ if (revents) { if (__put_user(revents, &uevent->events) || - __put_user(epi->event.data, &uevent->data)) + __put_user(epi->event.data, &uevent->data)) { + list_add(&epi->rdllink, head); return eventcnt ? eventcnt : -EFAULT; + } eventcnt++; uevent++; if (epi->event.events & EPOLLONESHOT)