Commit ffb4ef21 authored May 05, 2014 by Peter Zijlstra Committed by Ingo Molnar May 07, 2014

perf: Fix perf_event_init_context()



perf_pin_task_context() can return NULL but perf_event_init_context()
assumes it will not, correct this.

Reported-by: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Link: http://lkml.kernel.org/r/20140505171428.GU26782@laptop.programming.kicks-ass.net


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 46ce0fe9

kernel/events/core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -7729,6 +7729,8 @@ int perf_event_init_context(struct task_struct *child, int ctxn)
		* swapped under us.
		*/
		parent_ctx = perf_pin_task_context(parent, ctxn);
		if (!parent_ctx)
		return 0;

		/*
		* No need to check if parent_ctx != NULL here; since we saw