VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2018-08-24 09:25:39 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2018-08-24 09:25:39 -0700 commit: 4def1963608ed2b61aca5b52fdedb4ca2798820c parent: 5e8704ac1cfa9fceef94fcc457e18613b1589b34

Commit Summary:

Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Diffstat:

1 file changed, 1 insertion, 1 deletion

diff --git a/fs/xattr.c b/fs/xattr.c
index 3a24027c062d..daa732550088 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -538,7 +538,7 @@ getxattr(struct dentry *d, const char __user *name, void __user *value,
 	if (error > 0) {
 		if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) ||
 		    (strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0))
-			posix_acl_fix_xattr_to_user(kvalue, size);
+			posix_acl_fix_xattr_to_user(kvalue, error);
 		if (size && copy_to_user(value, kvalue, error))
 			error = -EFAULT;
 	} else if (error == -ERANGE && size >= XATTR_SIZE_MAX) {