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

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

Merge Pull Request from: @ci-robot 
 
PR sync from: Kaixiong Yu <yukaixiong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/34KX244PO2HQQSLFGHJN6B6JTPABBQRV/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SDT 
 
Link:https://gitee.com/openeuler/kernel/pulls/10209

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents bbdbf48b a6193481

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)