Skip to content

Commit

Permalink
x86: Stop recursive fault in print_context_stack after stack overflow
Browse files Browse the repository at this point in the history
After printing out the first line of a stack backtrace,
print_context_stack() calls print_ftrace_graph_addr() to check
if it's making a graph of function calls, usually not the case.

But unfortunate ordering of assignments causes this to oops if
an earlier stack overflow corrupted threadinfo->task.  Reorder
to avoid that irritation.

( The fact that there was a stack overflow may often be more
  interesting than the stack that can now be shown; but
  integrating that information with this stacktrace is awkward,
  so leave it to overflow reporting. )

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20120323225648.15DD5A033B@akpm.mtv.corp.google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Hugh Dickins authored and Ingo Molnar committed Mar 24, 2012
1 parent 4da7072 commit 65c0ff4
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions arch/x86/kernel/dumpstack.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,16 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
const struct stacktrace_ops *ops,
struct thread_info *tinfo, int *graph)
{
struct task_struct *task = tinfo->task;
struct task_struct *task;
unsigned long ret_addr;
int index = task->curr_ret_stack;
int index;

if (addr != (unsigned long)return_to_handler)
return;

task = tinfo->task;
index = task->curr_ret_stack;

if (!task->ret_stack || index < *graph)
return;

Expand Down

0 comments on commit 65c0ff4

Please sign in to comment.