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

!13956 fs: Fix uninitialized value issue in from_kuid and from_kgid 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yongjian Sun <sunyongjian1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/K34CKL3AZAWMWUH7QRMZ6E2FOWNVECGG/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB705C 
 
Link:https://gitee.com/openeuler/kernel/pulls/13956

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents f030ffc8 b7321368

fs/ocfs2/file.c

+6 −3
Original line number Diff line number Diff line
@@ -1133,9 +1133,12 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
	trace_ocfs2_setattr(inode, dentry,

			    (unsigned long long)OCFS2_I(inode)->ip_blkno,

			    dentry->d_name.len, dentry->d_name.name,

			    attr->ia_valid, attr->ia_mode,

			    from_kuid(&init_user_ns, attr->ia_uid),

			    from_kgid(&init_user_ns, attr->ia_gid));

			    attr->ia_valid,

				attr->ia_valid & ATTR_MODE ? attr->ia_mode : 0,

				attr->ia_valid & ATTR_UID ?

					from_kuid(&init_user_ns, attr->ia_uid) : 0,

				attr->ia_valid & ATTR_GID ?

					from_kgid(&init_user_ns, attr->ia_gid) : 0);



	/* ensuring we don't even attempt to truncate a symlink */

	if (S_ISLNK(inode->i_mode))