From: Peter Korsgaard <jacmet@sunsite.dk>
To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org,
baruch@tkos.co.il
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Subject: [PATCHv2] evdev: fix evdev_write return value on partial writes
Date: Thu, 27 Jan 2011 11:03:27 +0100 [thread overview]
Message-ID: <1296122607-9526-1-git-send-email-jacmet@sunsite.dk> (raw)
As was recently brought up on the busybox list
(http://lists.busybox.net/pipermail/busybox/2011-January/074565.html),
evdev_write doesn't properly check the count argument, which will
lead to a return value > count on partial writes if the remaining bytes
are accessible - Causing userspace confusion.
Fix it by only handling each full input_event structure and return -EINVAL
if less than 1 struct was written, similar to how it is done in evdev_read.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Changes since v1:
- Return -EINVAL on writes of length < sizeof(struct input_event), similar
to how it's done in evdev_read.
drivers/input/evdev.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index c8471a2..1ee7d0f 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -321,6 +321,9 @@ static ssize_t evdev_write(struct file *file, const char __user *buffer,
struct input_event event;
int retval;
+ if (count < input_event_size())
+ return -EINVAL;
+
retval = mutex_lock_interruptible(&evdev->mutex);
if (retval)
return retval;
@@ -330,7 +333,7 @@ static ssize_t evdev_write(struct file *file, const char __user *buffer,
goto out;
}
- while (retval < count) {
+ while ((retval + input_event_size()) <= count) {
if (input_event_from_user(buffer + retval, &event)) {
retval = -EFAULT;
--
1.7.2.3
next reply other threads:[~2011-01-27 10:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-27 10:03 Peter Korsgaard [this message]
2011-01-27 11:02 ` [PATCHv2] evdev: fix evdev_write return value on partial writes Henrik Rydberg
2011-01-27 11:21 ` Peter Korsgaard
2011-01-27 11:26 ` Baruch Siach
2011-01-27 11:29 ` Peter Korsgaard
2011-01-27 11:47 ` Henrik Rydberg
2011-01-27 12:04 ` Peter Korsgaard
2011-01-27 12:26 ` Henrik Rydberg
2011-01-27 12:43 ` Peter Korsgaard
2011-02-04 8:46 ` Dmitry Torokhov
2011-02-04 10:24 ` Henrik Rydberg
2011-02-04 11:00 ` Peter Korsgaard
2011-02-04 11:23 ` Henrik Rydberg
2011-02-04 17:15 ` Dmitry Torokhov
2011-02-04 17:22 ` Henrik Rydberg
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=1296122607-9526-1-git-send-email-jacmet@sunsite.dk \
--to=jacmet@sunsite.dk \
--cc=baruch@tkos.co.il \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@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;
as well as URLs for NNTP newsgroup(s).