[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <49A42E3F.1010005@cybernetics.com>
Date: Tue, 24 Feb 2009 12:28:31 -0500
From: Tony Battersby <tonyb@...ernetics.com>
To: Andrew Morton <akpm@...ux-foundation.org>,
Davide Libenzi <davidel@...ilserver.org>
Cc: Jonathan Corbet <corbet@....net>, linux-kernel@...r.kernel.org
Subject: [PATCH 3/6] [-mm] 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.
Signed-off-by: Tony Battersby <tonyb@...ernetics.com>
---
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.
--- a/fs/eventpoll.c 2009-02-23 14:01:41.000000000 -0500
+++ b/fs/eventpoll.c 2009-02-23 14:01:47.000000000 -0500
@@ -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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists