mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs/xattr.c:setxattr(): improve handling of allocation failures

Browse Source 
This allocation can be as large as 64k.

 - Add __GFP_NOWARN so the a falied kmalloc() is silent

 - Fall back to vmalloc() if the kmalloc() failed

Cc: Dave Chinner <david@fromorbit.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: David Rientjes <rientjes@google.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton
2012-04-05 14:25:07 -07:00
committed by Linus Torvalds
parent 0d08d7b7e1
commit 44c824982f
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/xattr.c
View File

@@ -321,6 +321,7 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
{ {
int error; int error;
void *kvalue = NULL; void *kvalue = NULL;
void *vvalue = NULL; /* If non-NULL, we used vmalloc() */
char kname[XATTR_NAME_MAX + 1]; char kname[XATTR_NAME_MAX + 1];
if (flags & ~(XATTR_CREATE|XATTR_REPLACE)) if (flags & ~(XATTR_CREATE|XATTR_REPLACE))
@@ -335,13 +336,25 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
if (size) { if (size) {
if (size > XATTR_SIZE_MAX) if (size > XATTR_SIZE_MAX)
return -E2BIG; return -E2BIG;
kvalue = memdup_user(value, size); kvalue = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
if (IS_ERR(kvalue)) if (!kvalue) {
return PTR_ERR(kvalue); vvalue = vmalloc(size);
if (!vvalue)
return -ENOMEM;
kvalue = vvalue;
}
if (copy_from_user(kvalue, value, size)) {
error = -EFAULT;
goto out;
}
} }
error = vfs_setxattr(d, kname, kvalue, size, flags); error = vfs_setxattr(d, kname, kvalue, size, flags);
kfree(kvalue); out:
if (vvalue)
vfree(vvalue);
else
kfree(kvalue);
return error; return error;
} }