From: Li Zefan <lizf@cn.fujitsu.com>
To: tyhicks@linux.vnet.ibm.com
Cc: LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
ecryptfs-devel@lists.launchpad.net
Subject: [PATCH 6/6] ecryptfs: use memdup_user()
Date: Wed, 08 Apr 2009 15:09:29 +0800 [thread overview]
Message-ID: <49DC4DA9.5060401@cn.fujitsu.com> (raw)
In-Reply-To: <49DC4CC0.9050805@cn.fujitsu.com>
Remove open-coded memdup_user().
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
fs/ecryptfs/miscdev.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
index a67fea6..dda3c58 100644
--- a/fs/ecryptfs/miscdev.c
+++ b/fs/ecryptfs/miscdev.c
@@ -418,18 +418,13 @@ ecryptfs_miscdev_write(struct file *file, const char __user *buf,
if (count == 0)
goto out;
- data = kmalloc(count, GFP_KERNEL);
- if (!data) {
- printk(KERN_ERR "%s: Out of memory whilst attempting to "
- "kmalloc([%zd], GFP_KERNEL)\n", __func__, count);
+
+ data = memdup_user(buf, count);
+ if (IS_ERR(data)) {
+ printk(KERN_ERR "%s: memdup_user returned error [%ld]\n",
+ __func__, PTR_ERR(data));
goto out;
}
- rc = copy_from_user(data, buf, count);
- if (rc) {
- printk(KERN_ERR "%s: copy_from_user returned error [%d]\n",
- __func__, rc);
- goto out_free;
- }
sz = count;
i = 0;
switch (data[i++]) {
--
1.5.4.rc3
prev parent reply other threads:[~2009-04-08 7:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-08 7:05 [PATCH 0/6] fs: use memdup_user() Li Zefan
2009-04-08 7:06 ` [PATCH 1/6] xattr: " Li Zefan
2009-04-08 7:06 ` [PATCH 2/6] btrfs: " Li Zefan
2009-04-08 7:07 ` [PATCH 3/6] sysfs: " Li Zefan
2009-04-08 7:08 ` [PATCH 4/6] xfs: " Li Zefan
2009-04-08 7:08 ` Li Zefan
2009-04-08 13:22 ` Christoph Hellwig
2009-04-08 13:22 ` Christoph Hellwig
2009-04-08 17:31 ` Roland Dreier
2009-04-08 17:31 ` Roland Dreier
2009-04-09 0:43 ` Li Zefan
2009-04-09 0:43 ` Li Zefan
2009-04-08 20:06 ` Felix Blyakher
2009-04-08 20:06 ` Felix Blyakher
2009-04-08 7:08 ` [PATCH 5/6] ncpfs: " Li Zefan
2009-04-08 7:09 ` Li Zefan [this message]
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=49DC4DA9.5060401@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=ecryptfs-devel@lists.launchpad.net \
--cc=linux-kernel@vger.kernel.org \
--cc=tyhicks@linux.vnet.ibm.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.