Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebfb4988 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf/x86/intel: Fix constraint access 



Sasha reported that we can get here with .idx==-1, and
cpuc->event_constraints unallocated.

Suggested-by: default avatarStephane Eranian <eranian@google.com>
Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: <stable@vger.kernel.org>
Fixes: b371b594 ("perf/x86: Fix event/group validation")
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d2498729

arch/x86/kernel/cpu/perf_event_intel.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -2316,9 +2316,12 @@ static struct event_constraint * 
intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,

intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,

			    struct perf_event *event)

			    struct perf_event *event)

{

{

	struct event_constraint *c1 = cpuc->event_constraint[idx];

	struct event_constraint *c1 = NULL;

	struct event_constraint *c2;

	struct event_constraint *c2;





	if (idx >= 0) /* fake does < 0 */

		c1 = cpuc->event_constraint[idx];



	/*

	/*

	 * first time only

	 * first time only

	 * - static constraint: no change across incremental scheduling calls

	 * - static constraint: no change across incremental scheduling calls