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

!9281 drivers/perf: hisi_pcie: Fix out-of-bound access when valid event group 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EKVYVHK57U5YMCTN736EPPVV3UYGXKWR/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6S7E 
 
Link:https://gitee.com/openeuler/kernel/pulls/9281

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 5eef93e2 3b74cf0a

drivers/perf/hisilicon/hisi_pcie_pmu.c

+13 −1
Original line number Diff line number Diff line
@@ -343,15 +343,27 @@ static bool hisi_pcie_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 (hisi_pcie_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 == HISI_PCIE_MAX_COUNTERS)

			return false;



		if (num == counters)

			event_group[counters++] = sibling;

	}



	return counters <= HISI_PCIE_MAX_COUNTERS;

	return true;

}



static int hisi_pcie_pmu_event_init(struct perf_event *event)