diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-03-16 01:45:03 +0100 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2009-04-27 10:36:52 -0700 |
| commit | 69186bb21b2238901ccabd01f29669cf4e147f71 (patch) | |
| tree | 91c09f66e95ce7f0541205b80bd7eb0aacdb76c1 /kernel | |
| parent | f8629efabc754f5c0003ce38c28b26db7ca89244 (diff) | |
tracing/core: fix early free of cpumasks
upstream commit: 2fc1dfbe17e7705c55b7a99da995fa565e26f151
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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 17bb88d86ac2..b2387c04afd6 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3886,7 +3886,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_cpumask); |