Commit 2721e72d authored Mar 12, 2013 by Steven Rostedt (Red Hat) Committed by Steven Rostedt Mar 12, 2013

tracing: Fix race in snapshot swapping



Although the swap is wrapped with a spin_lock, the assignment
of the temp buffer used to swap is not within that lock.
It needs to be moved into that lock, otherwise two swaps
happening on two different CPUs, can end up using the wrong
temp buffer to assign in the swap.

Luckily, all current callers of the swap function appear to have
their own locks. But in case something is added that allows two
different callers to call the swap, then there's a chance that
this race can trigger and corrupt the buffers.

New code is coming soon that will allow for this race to trigger.

I've Cc'd stable, so this bug will not show up if someone backports
one of the changes that can trigger this bug.

Cc: stable@vger.kernel.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent 1abccd74

kernel/trace/trace.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -704,7 +704,7 @@ __update_max_tr(struct trace_array tr, struct task_struct tsk, int cpu)
		void
		update_max_tr(struct trace_array tr, struct task_struct tsk, int cpu)
		{
		struct ring_buffer *buf = tr->buffer;
		struct ring_buffer *buf;

		if (trace_stop_count)
		return;
		@@ -719,6 +719,7 @@ update_max_tr(struct trace_array tr, struct task_struct tsk, int cpu)

		arch_spin_lock(&ftrace_max_lock);

		buf = tr->buffer;
		tr->buffer = max_tr.buffer;
		max_tr.buffer = buf;

Admin message