Commit ea14eb71 authored Mar 12, 2010 by Steven Rostedt Committed by Steven Rostedt Mar 12, 2010

function-graph: Init curr_ret_stack with ret_stack



If the graph tracer is active, and a task is forked but the allocating of
the processes graph stack fails, it can cause crash later on.

This is due to the temporary stack being NULL, but the curr_ret_stack
variable is copied from the parent. If it is not -1, then in
ftrace_graph_probe_sched_switch() the following:

	for (index = next->curr_ret_stack; index >= 0; index--)
		next->ret_stack[index].calltime += timestamp;

Will cause a kernel OOPS.

Found with Li Zefan's ftrace_stress_test.

Cc: stable@kernel.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent 52fbe9cd

kernel/trace/ftrace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3349,6 +3349,7 @@ void ftrace_graph_init_task(struct task_struct *t)
		{
		/* Make sure we do not use the parent ret_stack */
		t->ret_stack = NULL;
		t->curr_ret_stack = -1;

		if (ftrace_graph_active) {
		struct ftrace_ret_stack *ret_stack;
		@@ -3358,7 +3359,6 @@ void ftrace_graph_init_task(struct task_struct *t)
		GFP_KERNEL);
		if (!ret_stack)
		return;
		t->curr_ret_stack = -1;
		atomic_set(&t->tracing_graph_pause, 0);
		atomic_set(&t->trace_overrun, 0);
		t->ftrace_timestamp = 0;

Admin message