From: Tony Battersby <tonyb@cybernetics.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Davide Libenzi <davidel@xmailserver.org>
Cc: Jonathan Corbet <corbet@lwn.net>, linux-kernel@vger.kernel.org
Subject: [PATCH 3/6] [-mm] epoll: remember the event if epoll_wait returns -EFAULT
Date: Tue, 24 Feb 2009 12:28:31 -0500 [thread overview]
Message-ID: <49A42E3F.1010005@cybernetics.com> (raw)
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>
---
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)
next reply other threads:[~2009-02-24 17:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-24 17:28 Tony Battersby [this message]
2009-02-26 16:36 ` Davide Libenzi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49A42E3F.1010005@cybernetics.com \
--to=tonyb@cybernetics.com \
--cc=akpm@linux-foundation.org \
--cc=corbet@lwn.net \
--cc=davidel@xmailserver.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome