Skip to content

Commit 77fce82

Browse files
Junhao Hewilldeacon
authored andcommitted
drivers/perf: hisi_pcie: Fix out-of-bound access when valid event group
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 HISI_PCIE_MAX_COUNTERS, 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: 8404b0f ("drivers/perf: hisi: Add driver for HiSilicon PCIe PMU") Signed-off-by: Junhao He <[email protected]> Reviewed-by: Jijie Shao <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 4052ce0 commit 77fce82

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

drivers/perf/hisilicon/hisi_pcie_pmu.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,15 +350,27 @@ static bool hisi_pcie_pmu_validate_event_group(struct perf_event *event)
350350
return false;
351351

352352
for (num = 0; num < counters; num++) {
353+
/*
354+
* If we find a related event, then it's a valid group
355+
* since we don't need to allocate a new counter for it.
356+
*/
353357
if (hisi_pcie_pmu_cmp_event(event_group[num], sibling))
354358
break;
355359
}
356360

361+
/*
362+
* Otherwise it's a new event but if there's no available counter,
363+
* fail the check since we cannot schedule all the events in
364+
* the group simultaneously.
365+
*/
366+
if (num == HISI_PCIE_MAX_COUNTERS)
367+
return false;
368+
357369
if (num == counters)
358370
event_group[counters++] = sibling;
359371
}
360372

361-
return counters <= HISI_PCIE_MAX_COUNTERS;
373+
return true;
362374
}
363375

364376
static int hisi_pcie_pmu_event_init(struct perf_event *event)

0 commit comments

Comments
 (0)