Commit a1505c47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-urgent-2024-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf event fix from Ingo Molnar:
 "Fix the x86 PMU multi-counter code returning invalid data in certain
  circumstances"

* tag 'perf-urgent-2024-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix out of range data
parents fa37b3be dec8ced8

arch/x86/events/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,7 @@ static void x86_pmu_del(struct perf_event *event, int flags) 
	while (++i < cpuc->n_events) {

		cpuc->event_list[i-1] = cpuc->event_list[i];

		cpuc->event_constraint[i-1] = cpuc->event_constraint[i];

		cpuc->assign[i-1] = cpuc->assign[i];

	}

	cpuc->event_constraint[i-1] = NULL;

	--cpuc->n_events;