From: Li Hong <lihong.hi@gmail.com>
To: oliver@neukum.name, linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] usb: use memdup_user()
Date: Mon, 4 May 2009 00:00:56 +0800 [thread overview]
Message-ID: <3a3680030905030900x672af596mc2ebc3c38f119c92@mail.gmail.com> (raw)
Replace a combination call of kmalloc() and copy_from_user() with memdup_user().
Signed-off-by: Li Hong <lihong.hi@gmail.com>
---
drivers/usb/class/cdc-wdm.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 0fe4345..326ecf3 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -324,18 +324,11 @@ static ssize_t wdm_write
goto out;
}
- desc->outbuf = buf = kmalloc(count, GFP_KERNEL);
- if (!buf) {
- rv = -ENOMEM;
+ desc->outbuf = buf = memdup_user(buffer, count);
+ if (IS_ERR(buf)) {
+ rv = PTR_ERR(buf);
goto out;
- }
-
- r = copy_from_user(buf, buffer, count);
- if (r > 0) {
- kfree(buf);
- rv = -EFAULT;
- goto out;
- }
+ }
req = desc->orq;
usb_fill_control_urb(
--
1.6.2.GIT
next reply other threads:[~2009-05-03 16:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-03 16:00 Li Hong [this message]
2009-05-03 16:28 ` Oliver Neukum
2009-05-03 17:09 ` Oliver Neukum
2009-05-04 3:38 ` Li Hong
2009-05-04 6:54 ` Oliver Neukum
2009-05-04 7:02 ` David Brownell
2009-05-04 7:41 ` Pekka Enberg
2009-05-04 14:53 ` Greg KH
2009-05-04 15:13 ` Li Hong
2009-05-05 8:50 ` Oliver Neukum
2009-05-04 14:01 ` Oliver Neukum
2009-05-05 6:11 ` Andrew Morton
2009-05-05 10:44 ` Oliver Neukum
2009-05-05 17:22 ` Andrew Morton
2009-05-06 13:34 ` Oliver Neukum
2009-05-06 18:31 ` Andrew Morton
2009-05-06 18:44 ` Oliver Neukum
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=3a3680030905030900x672af596mc2ebc3c38f119c92@mail.gmail.com \
--to=lihong.hi@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=oliver@neukum.name \
/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
all inboxes | Powered by JetHome®