aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-03-16 01:45:03 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-16 09:13:18 +0100
commit2fc1dfbe17e7705c55b7a99da995fa565e26f151 (patch)
tree8d7ecb57fdefdfac5bdff6ee3a82485e2ea4340a /kernel
parenttracing/ftrace: fix double calls to tracing_start() (diff)
downloadlinux-dev-2fc1dfbe17e7705c55b7a99da995fa565e26f151.tar.xz
linux-dev-2fc1dfbe17e7705c55b7a99da995fa565e26f151.zip
tracing/core: fix early free of cpumasks
Impact: fix crashes when tracing cpumasks While ring-buffer allocation, the cpumasks are allocated too, including the tracing cpumask and the per-cpu file mask handler. But these cpumasks are freed accidentally just after. Fix it. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <1237164303-11476-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c0cf946d42f5..ae32d3b99b4b 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4125,7 +4125,8 @@ __init static int tracer_alloc_buffers(void)
&trace_panic_notifier);
register_die_notifier(&trace_die_notifier);
- ret = 0;
+
+ return 0;
out_free_cpumask:
free_cpumask_var(tracing_reader_cpumask);