f2fs: update multi-dev metadata in resize_fs

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index 7444fb1..cd786d5 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -430,6 +430,7 @@ getxattr(struct dentry *d, const char __user *name, void __user *value,
        void *kvalue = NULL;
        void *vvalue = NULL;
        char kname[XATTR_NAME_MAX + 1];
+       char kvalue_onstack[SZ_4K] __aligned(sizeof(long));
 
        error = strncpy_from_user(kname, name, sizeof(kname));
        if (error == 0 || error == sizeof(kname))
@@ -438,14 +439,19 @@ getxattr(struct dentry *d, const char __user *name, void __user *value,
                return error;
 
        if (size) {
-               if (size > XATTR_SIZE_MAX)
-                       size = XATTR_SIZE_MAX;
-               kvalue = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
-               if (!kvalue) {
-                       vvalue = vzalloc(size);
-                       if (!vvalue)
-                               return -ENOMEM;
-                       kvalue = vvalue;
+               if (size <= ARRAY_SIZE(kvalue_onstack)) {
+                       kvalue = kvalue_onstack;
+                       memset(kvalue, 0, size);
+               } else {
+                       if (size > XATTR_SIZE_MAX)
+                               size = XATTR_SIZE_MAX;
+                       kvalue = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
+                       if (!kvalue) {
+                               vvalue = vzalloc(size);
+                               if (!vvalue)
+                                       return -ENOMEM;
+                               kvalue = vvalue;
+                       }
                }
        }
 
@@ -463,7 +469,7 @@ getxattr(struct dentry *d, const char __user *name, void __user *value,
        }
        if (vvalue)
                vfree(vvalue);
-       else
+       else if (kvalue != kvalue_onstack)
                kfree(kvalue);
        return error;
 }