author: Li Zefan <lizf@cn.fujitsu.com> 2009-04-08 15:06:12 +0800
committer: Al Viro <viro@zeniv.linux.org.uk> 2009-04-20 23:02:50 -0400
commit: 3939fcde24473dc09ce16e922c88df9b3bee45d9
parent: 3eac8778a237d83a1e553eba0c6f4fd4b39eeec0
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 7 deletions
diff --git a/fs/xattr.c b/fs/xattr.c
index 197c4fcac032..d51b8f9db921 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -237,13 +237,9 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
if (size) {
if (size > XATTR_SIZE_MAX)
return -E2BIG;
- kvalue = kmalloc(size, GFP_KERNEL);
- if (!kvalue)
- return -ENOMEM;
- if (copy_from_user(kvalue, value, size)) {
- kfree(kvalue);
- return -EFAULT;
- }
+ kvalue = memdup_user(value, size);
+ if (IS_ERR(kvalue))
+ return PTR_ERR(kvalue);
}
error = vfs_setxattr(d, kname, kvalue, size, flags);