* [PATCH 2/5] epoll: remember the event if epoll_wait returns -EFAULT
@ 2009-03-02 23:10 Tony Battersby
0 siblings, 0 replies; only message in thread
From: Tony Battersby @ 2009-03-02 23:10 UTC (permalink / raw)
To: Andrew Morton; +Cc: Davide Libenzi, Linux Kernel Mailing List
If epoll_wait returns -EFAULT, the event that was being returned when
the fault was encountered will be forgotten. This is not a big deal
since EFAULT will happen only if a buggy userspace program passes in a
bad address, in which case what happens later usually doesn't matter.
However, it is easy to remember the event for later, and this patch
makes a simple change to do that.
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
---
--- a/fs/eventpoll.c 2009-02-23 14:01:41.000000000 -0500
+++ b/fs/eventpoll.c 2009-02-23 14:01:47.000000000 -0500
@@ -1082,8 +1082,10 @@ static int ep_send_events_proc(struct ev
*/
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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-02 23:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-02 23:10 [PATCH 2/5] epoll: remember the event if epoll_wait returns -EFAULT Tony Battersby
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox