Commit 9baba666 authored Apr 10, 2013 by Linus Torvalds

Merge tag 'trace-fixes-3.9-rc-v2' of...

Merge tag 'trace-fixes-3.9-rc-v2' of git://git.kernel.org/pub/scm/linux/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

parents fe2971a0 83e03b3f

kernel/trace/ftrace.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;