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

Commit 0b861225 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86, perf: Fix NULL deref on not assigned x86_pmu 



In case of not assigned x86_pmu and software events NULL dereference may
being hit via x86_pmu::schedule_events method.

Fix it by checking if x86_pmu is initialized at all.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Cc: Lin Ming <ming.m.lin@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20100311215016.GG25162@lenovo>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a072738e

arch/x86/kernel/cpu/perf_event.c

+3 −0
Original line number Diff line number Diff line
@@ -1269,6 +1269,9 @@ int hw_perf_group_sched_in(struct perf_event *leader, 
	int assign[X86_PMC_IDX_MAX];

	int n0, n1, ret;



	if (!x86_pmu_initialized())

		return 0;



	/* n0 = total number of events */

	n0 = collect_events(cpuc, leader, true);

	if (n0 < 0)