Commit a6193481 authored by Junhao He's avatar Junhao He Committed by Kaixiong Yu
Browse files

drivers/perf: hisi: hns3: Fix out-of-bound access when valid event group 

stable inclusion
from stable-v6.6.33
commit be1fa711e59c874d049f592aef1d4685bdd22bdf
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA6SDT
CVE: CVE-2024-38568

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



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

[ Upstream commit 81bdd60a3d1d3b05e6cc6674845afb1694dd3a0e ]

The perf tool allows users to create event groups through following
cmd [1], but the driver does not check whether the array index is out
of bounds when writing data to the event_group array. If the number of
events in an event_group is greater than HNS3_PMU_MAX_HW_EVENTS, the
memory write overflow of event_group array occurs.

Add array index check to fix the possible array out of bounds violation,
and return directly when write new events are written to array bounds.

There are 9 different events in an event_group.
[1] perf stat -e '{pmu/event1/, ... ,pmu/event9/}

Fixes: 66637ab1 ("drivers/perf: hisi: add driver for HNS3 PMU")
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
Signed-off-by: default avatarHao Chen <chenhao418@huawei.com>
Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarJijie Shao <shaojijie@huawei.com>
Link: https://lore.kernel.org/r/20240425124627.13764-3-hejunhao3@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKaixiong Yu <yukaixiong@huawei.com>
parent 18c65833

drivers/perf/hisilicon/hns3_pmu.c

+13 −1
Original line number Diff line number Diff line
@@ -1088,15 +1088,27 @@ static bool hns3_pmu_validate_event_group(struct perf_event *event) 
			return false;



		for (num = 0; num < counters; num++) {

			/*

			 * If we find a related event, then it's a valid group

			 * since we don't need to allocate a new counter for it.

			 */

			if (hns3_pmu_cmp_event(event_group[num], sibling))

				break;

		}



		/*

		 * Otherwise it's a new event but if there's no available counter,

		 * fail the check since we cannot schedule all the events in

		 * the group simultaneously.

		 */

		if (num == HNS3_PMU_MAX_HW_EVENTS)

			return false;



		if (num == counters)

			event_group[counters++] = sibling;

	}



	return counters <= HNS3_PMU_MAX_HW_EVENTS;

	return true;

}



static u32 hns3_pmu_get_filter_condition(struct perf_event *event)