Commit ed146b25 authored Nov 03, 2009 by Li Zefan Committed by Steven Rostedt Nov 04, 2009

ftrace: Fix unmatched locking in ftrace_regex_write()



When a command is passed to the set_ftrace_filter, then
the ftrace_regex_lock is still held going back to user space.

 # echo 'do_open : foo' > set_ftrace_filter
 (still holding ftrace_regex_lock when returning to user space!)

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4AEF7F8A.3080300@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent f7112949

kernel/trace/ftrace.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2222,15 +2222,15 @@ ftrace_regex_write(struct file file, const char __user ubuf,
		ret = ftrace_process_regex(parser->buffer,
		parser->idx, enable);
		if (ret)
		goto out;
		goto out_unlock;

		trace_parser_clear(parser);
		}

		ret = read;

		out_unlock:
		mutex_unlock(&ftrace_regex_lock);
		out:

		return ret;
		}