diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2009-11-03 08:55:38 +0800 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2009-11-04 01:42:10 -0500 |
| commit | ed146b25942b428f8e8056587b7638ce76573c2f (patch) | |
| tree | 36b3355b5d53057accb92000ee5b3986d5a05a8b /kernel | |
| parent | f7112949f6a4cd6883d66c882d568c2197321de6 (diff) | |
| download | kernel_goldelico_gta04-ed146b25942b428f8e8056587b7638ce76573c2f.zip kernel_goldelico_gta04-ed146b25942b428f8e8056587b7638ce76573c2f.tar.gz kernel_goldelico_gta04-ed146b25942b428f8e8056587b7638ce76573c2f.tar.bz2 | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/ftrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 9c451a1..6dc4e5e 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -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; } |