diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2009-04-08 15:09:29 +0800 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-04-20 23:02:51 -0400 |
| commit | fd56d242b3b80b6f2ca174272b20029aae61df75 (patch) | |
| tree | 57f51b3471dc6fdb8bcb92bff5bfdc8f4c441cd1 /fs | |
| parent | a9482ebcdedbc5872ed34a266e6a45c35116f264 (diff) | |
| download | kernel_samsung_smdk4412-fd56d242b3b80b6f2ca174272b20029aae61df75.tar.gz kernel_samsung_smdk4412-fd56d242b3b80b6f2ca174272b20029aae61df75.tar.bz2 kernel_samsung_smdk4412-fd56d242b3b80b6f2ca174272b20029aae61df75.zip | |
ecryptfs: use memdup_user()
Remove open-coded memdup_user().
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | 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 a67fea655f4..dda3c58eefc 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++]) { |