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

!8208 ocfs2: mount fails with buffer overflow in strlen 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EIFSIAV5M3AEUCNPGNX27NBEITC3UMTM/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RBKI 
 
Link:https://gitee.com/openeuler/kernel/pulls/8208

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 89f4c0a8 a7af9966

fs/ocfs2/super.c

+10 −4
Original line number Diff line number Diff line
@@ -2205,11 +2205,17 @@ static int ocfs2_initialize_super(struct super_block *sb, 
	}



	if (ocfs2_clusterinfo_valid(osb)) {

		/*

		 * ci_stack and ci_cluster in ocfs2_cluster_info may not be null

		 * terminated, so make sure no overflow happens here by using

		 * memcpy. Destination strings will always be null terminated

		 * because osb is allocated using kzalloc.

		 */

		osb->osb_stackflags =

			OCFS2_RAW_SB(di)->s_cluster_info.ci_stackflags;

		strlcpy(osb->osb_cluster_stack,

		memcpy(osb->osb_cluster_stack,

		       OCFS2_RAW_SB(di)->s_cluster_info.ci_stack,

		       OCFS2_STACK_LABEL_LEN + 1);

		       OCFS2_STACK_LABEL_LEN);

		if (strlen(osb->osb_cluster_stack) != OCFS2_STACK_LABEL_LEN) {

			mlog(ML_ERROR,

			     "couldn't mount because of an invalid "
@@ -2218,9 +2224,9 @@ static int ocfs2_initialize_super(struct super_block *sb, 
			status = -EINVAL;

			goto bail;

		}

		strlcpy(osb->osb_cluster_name,

		memcpy(osb->osb_cluster_name,

			OCFS2_RAW_SB(di)->s_cluster_info.ci_cluster,

			OCFS2_CLUSTER_NAME_LEN + 1);

			OCFS2_CLUSTER_NAME_LEN);

	} else {

		/* The empty string is identical with classic tools that

		 * don't know about s_cluster_info. */