Merge tag 'pci-v5.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index cd7a563..fd57153 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -276,8 +276,16 @@ vfs_setxattr(struct dentry *dentry, const char *name, const void *value,
 {
        struct inode *inode = dentry->d_inode;
        struct inode *delegated_inode = NULL;
+       const void  *orig_value = value;
        int error;
 
+       if (size && strcmp(name, XATTR_NAME_CAPS) == 0) {
+               error = cap_convert_nscap(dentry, &value, size);
+               if (error < 0)
+                       return error;
+               size = error;
+       }
+
 retry_deleg:
        inode_lock(inode);
        error = __vfs_setxattr_locked(dentry, name, value, size, flags,
@@ -289,6 +297,9 @@ retry_deleg:
                if (!error)
                        goto retry_deleg;
        }
+       if (value != orig_value)
+               kfree(value);
+
        return error;
 }
 EXPORT_SYMBOL_GPL(vfs_setxattr);
@@ -537,12 +548,6 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
                if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) ||
                    (strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0))
                        posix_acl_fix_xattr_from_user(kvalue, size);
-               else if (strcmp(kname, XATTR_NAME_CAPS) == 0) {
-                       error = cap_convert_nscap(d, &kvalue, size);
-                       if (error < 0)
-                               goto out;
-                       size = error;
-               }
        }
 
        error = vfs_setxattr(d, kname, kvalue, size, flags);