Unverified Commit b0fd156a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6766 [sync] PR-6669: NFSv4.2: fix nfs4_listxattr kernel BUG at mm/usercopy.c:102 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/6669 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CWSNJJVN6H2UM2QPWH2NX6SNB2IPA5DX/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9HK78 
 
Link:https://gitee.com/openeuler/kernel/pulls/6766

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 272aabf7 cc6f6db3

fs/nfs/nfs4proc.c

+10 −6
Original line number Diff line number Diff line
@@ -10348,29 +10348,33 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = { 
static ssize_t nfs4_listxattr(struct dentry *dentry, char *list, size_t size)

{

	ssize_t error, error2, error3;

	size_t left = size;



	error = generic_listxattr(dentry, list, size);

	error = generic_listxattr(dentry, list, left);

	if (error < 0)

		return error;

	if (list) {

		list += error;

		size -= error;

		left -= error;

	}



	error2 = nfs4_listxattr_nfs4_label(d_inode(dentry), list, size);

	error2 = nfs4_listxattr_nfs4_label(d_inode(dentry), list, left);

	if (error2 < 0)

		return error2;



	if (list) {

		list += error2;

		size -= error2;

		left -= error2;

	}



	error3 = nfs4_listxattr_nfs4_user(d_inode(dentry), list, size);

	error3 = nfs4_listxattr_nfs4_user(d_inode(dentry), list, left);

	if (error3 < 0)

		return error3;



	return error + error2 + error3;

	error += error2 + error3;

	if (size && error > size)

		return -ERANGE;

	return error;

}



static const struct inode_operations nfs4_dir_inode_operations = {