Skip to content

Commit

Permalink
Merge tag 'trace-fixes-3.9-rc-v2' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Namhyung Kim fixed a long standing bug that can cause a kernel panic.

  If the function profiler fails to allocate memory for everything, it
  will do a double free on the same pointer which can cause a panic"

* tag 'trace-fixes-3.9-rc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix double free when function profile init failed
  • Loading branch information
Linus Torvalds committed Apr 10, 2013
2 parents fe2971a + 83e03b3 commit 9baba66
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,6 @@ int ftrace_profile_pages_init(struct ftrace_profile_stat *stat)
free_page(tmp);
}

free_page((unsigned long)stat->pages);
stat->pages = NULL;
stat->start = NULL;

Expand Down

0 comments on commit 9baba66

Please sign in to comment.