Commit 200e5bdd authored by Radu Rendec's avatar Radu Rendec Committed by Wupeng Ma
Browse files

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

stable inclusion
from stable-v5.10.235
commit e4fde33107351ec33f1a64188612fbc6ca659284
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBPC4K
CVE: CVE-2025-21785

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e4fde33107351ec33f1a64188612fbc6ca659284



--------------------------------

[ Upstream commit 875d742cf5327c93cba1f11e12b08d3cce7a88d2 ]

The loop that detects/populates cache information already has a bounds
check on the array size but does not account for cache levels with
separate data/instructions cache. Fix this by incrementing the index
for any populated leaf (instead of any populated level).

Fixes: 5d425c18 ("arm64: kernel: add support for cpu cache information")

Signed-off-by: default avatarRadu Rendec <rrendec@redhat.com>
Link: https://lore.kernel.org/r/20250206174420.2178724-1-rrendec@redhat.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWupeng Ma <mawupeng1@huawei.com>
parent 8c45ad1b

arch/arm64/kernel/cacheinfo.c

+7 −5
Original line number Diff line number Diff line
@@ -87,16 +87,18 @@ 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;