PCI / PM: Always check PME wakeup capability for runtime wakeup support

[mirror_ubuntu-artful-kernel.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index 9c54e1393a77810123b56fb5b3ade90be68e187f..3c0e19b443b67c1b0aed68817abf493299770159 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -250,7 +250,7 @@ xattr_getsecurity(struct inode *inode, const char *name, void *value,
        }
        memcpy(value, buffer, len);
 out:
-       security_release_secctx(buffer, len);
+       kfree(buffer);
 out_noalloc:
        return len;
 }
@@ -465,6 +465,12 @@ 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);