ocfs2: add missing return value check of ocfs2_get_clusters() (2b0f6eae) · Commits · e / devices / android_kernel_xiaomi_markw

In ocfs2_attach_refcount_tree() and ocfs2_duplicate_extent_list(), if error occurs when calling ocfs2_get_clusters(), it will go with unexpected behavior as local variables p_cluster, num_clusters and ext_flags are declared without initialization. Signed-off-by:

Joseph Qi <joseph.qi@huawei.com> Reviewed-by:

Jie Liu <jeff.liu@oracle.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Mark Fasheh <mfasheh@suse.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/ocfs2/refcounttree.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -3854,7 +3854,10 @@ static int ocfs2_attach_refcount_tree(struct inode *inode,
		while (cpos < clusters) {
		ret = ocfs2_get_clusters(inode, cpos, &p_cluster,
		&num_clusters, &ext_flags);

		if (ret) {
		mlog_errno(ret);
		goto unlock;
		}
		if (p_cluster && !(ext_flags & OCFS2_EXT_REFCOUNTED)) {
		ret = ocfs2_add_refcount_flag(inode, &di_et,
		&ref_tree->rf_ci,
		@@ -4025,7 +4028,10 @@ static int ocfs2_duplicate_extent_list(struct inode *s_inode,
		while (cpos < clusters) {
		ret = ocfs2_get_clusters(s_inode, cpos, &p_cluster,
		&num_clusters, &ext_flags);

		if (ret) {
		mlog_errno(ret);
		goto out;
		}
		if (p_cluster) {
		ret = ocfs2_add_refcounted_extent(t_inode, &et,
		ref_ci, ref_root_bh,