2009-04-23 07:30:33

by Chris Wright

[permalink] [raw]
Subject: [patch 010/100] tracing/core: fix early free of cpumasks

-stable review patch. If anyone has any objections, please let us know.
---------------------

From: Frederic Weisbecker <[email protected]>

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 <[email protected]>
Signed-off-by: Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
kernel/trace/trace.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3886,7 +3886,8 @@ __init static int tracer_alloc_buffers(v
&trace_panic_notifier);

register_die_notifier(&trace_die_notifier);
- ret = 0;
+
+ return 0;

out_free_cpumask:
free_cpumask_var(tracing_cpumask);