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

!15674 arm64: cacheinfo: Avoid out-of-bounds write to cacheinfo array 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wupeng Ma <mawupeng1@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/PEYA5PUIPBJ6CPPVPA4Y7CN6NWNTZLUB/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBPC4K 
 
Link:https://gitee.com/openeuler/kernel/pulls/15674

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 4d1e2474 5786e829

arch/arm64/kernel/cacheinfo.c

+7 −5
Original line number Diff line number Diff line
@@ -96,16 +96,18 @@ static int __populate_cache_leaves(unsigned int cpu) 
	unsigned int level, idx;

	enum cache_type type;

	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);

	struct cacheinfo *this_leaf = this_cpu_ci->info_list;

	struct cacheinfo *infos = this_cpu_ci->info_list;



	for (idx = 0, level = 1; level <= this_cpu_ci->num_levels &&

	     idx < this_cpu_ci->num_leaves; idx++, level++) {

	     idx < this_cpu_ci->num_leaves; level++) {

		type = get_cache_type(level);

		if (type == CACHE_TYPE_SEPARATE) {

			ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);

			ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);

			if (idx + 1 >= this_cpu_ci->num_leaves)

				break;

			ci_leaf_init(&infos[idx++], CACHE_TYPE_DATA, level);

			ci_leaf_init(&infos[idx++], CACHE_TYPE_INST, level);

		} else {

			ci_leaf_init(this_leaf++, type, level);

			ci_leaf_init(&infos[idx++], type, level);

		}

	}

	return 0;