epoll: remember the event if epoll_wait returns -EFAULT
PATCH 3/6 epoll: remember the event if epoll_wait returns -EFAULT
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.
---
This patch is against the current -mm tree, and might not apply to 2.6.29. Since this patch probably won't go into 2.6.29, you may apply this version of the patch after the other patches in -mm.
fs/eventpoll.c +3 -1
@@ -1119,8 +1119,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 )
Quoted 6 lines · Tony Battersby
If
epoll_waitreturns-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.
It doesn't really matter with an EFAULT coming, anyway ...
- Davide