From: Kulikov Vasiliy <segooon@gmail.com>
To: kernel-janitors@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>, Willy Tarreau <w@1wt.eu>,
Peter Huewe <peterhuewe@gmx.de>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Julia Lawall <julia@diku.dk>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/9] staging: panel: check put_user() return value
Date: Fri, 30 Jul 2010 15:08:42 +0400 [thread overview]
Message-ID: <1280488123-20859-1-git-send-email-segooon@gmail.com> (raw)
put_user() may fail, if so return -EFAULT and do not update driver
pointers.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
drivers/staging/panel/panel.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index f58da32..57f4946 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -1589,25 +1589,30 @@ void lcd_init(void)
static ssize_t keypad_read(struct file *file,
char *buf, size_t count, loff_t *ppos)
{
-
+ int buflen = keypad_buflen;
unsigned i = *ppos;
char *tmp = buf;
+ int start = keypad_start;
- if (keypad_buflen == 0) {
+ if (buflen == 0) {
if (file->f_flags & O_NONBLOCK)
return -EAGAIN;
interruptible_sleep_on(&keypad_read_wait);
if (signal_pending(current))
return -EINTR;
+ buflen = keypad_buflen;
}
- for (; count-- > 0 && (keypad_buflen > 0);
- ++i, ++tmp, --keypad_buflen) {
- put_user(keypad_buffer[keypad_start], tmp);
- keypad_start = (keypad_start + 1) % KEYPAD_BUFFER;
+ for (; count-- > 0 && (buflen > 0);
+ ++i, ++tmp, --buflen) {
+ if (put_user(keypad_buffer[start], tmp))
+ return -EFAULT;
+ start = (start + 1) % KEYPAD_BUFFER;
}
*ppos = i;
+ keypad_buflen = buflen;
+ keypad_start = start;
return tmp - buf;
}
--
1.7.0.4
next reply other threads:[~2010-07-30 11:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-30 11:08 Kulikov Vasiliy [this message]
2010-07-30 21:15 ` Willy Tarreau
2010-07-31 8:39 ` walter harms
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=1280488123-20859-1-git-send-email-segooon@gmail.com \
--to=segooon@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=julia@diku.dk \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=w@1wt.eu \
/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