From: nikai@nikai.net (Nicolas Kaiser)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] dma/coh901318: use simple_read_from_buffer
Date: Fri, 22 Oct 2010 20:30:39 +0200 [thread overview]
Message-ID: <20101022203039.7b353056@absol.kitzblitz> (raw)
In-Reply-To: <201010221938.12591.arnd@arndb.de>
* Arnd Bergmann <arnd@arndb.de>:
> On Friday 22 October 2010 19:29:53 Nicolas Kaiser wrote:
> > If copy_to_user fails, the assigned error code instantly gets
> > overwritten, and the failure apparently ignored. Moreover,
> > shouldn't the error code be -EFAULT instead of -EINVAL?
>
> Looks good, but it would be even better to just use
> simple_read_from_buffer in this function, which takes care of
> a lot the other complexities as well.
Like this? (Sorry, untested.)
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
---
obsoletes patch "dma/coh901318: fix copy_to_user error path"
drivers/dma/coh901318.c | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index ae2b871..e7d0f06 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -133,17 +133,7 @@ static int coh901318_debugfs_read(struct file *file, char __user *buf,
tmp += sprintf(tmp, "Pool alloc nbr %d\n", pool_count);
dev_size = tmp - dev_buf;
- /* No more to read if offset != 0 */
- if (*f_pos > dev_size)
- goto out;
-
- if (count > dev_size - *f_pos)
- count = dev_size - *f_pos;
-
- if (copy_to_user(buf, dev_buf + *f_pos, count))
- ret = -EINVAL;
- ret = count;
- *f_pos += count;
+ ret = simple_read_from_buffer(buf, count, f_pos, dev_buf, dev_size);
out:
kfree(dev_buf);
--
1.7.2.2
next prev parent reply other threads:[~2010-10-22 18:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 17:29 [PATCH] dma/coh901318: fix copy_to_user error path Nicolas Kaiser
2010-10-22 17:38 ` Arnd Bergmann
2010-10-22 18:30 ` Nicolas Kaiser [this message]
2010-10-22 19:16 ` [PATCH] dma/coh901318: use simple_read_from_buffer Arnd Bergmann
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=20101022203039.7b353056@absol.kitzblitz \
--to=nikai@nikai.net \
--cc=linux-arm-kernel@lists.infradead.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