lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftrace: Fix unmatched locking in ftrace_regex_write()

Browse Source 
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>
This commit is contained in:
Li Zefan
2009-11-03 08:55:38 +08:00
committed by Steven Rostedt
parent f7112949f6
commit ed146b2594
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/trace/ftrace.c
View File

@@ -2222,15 +2222,15 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,
ret = ftrace_process_regex(parser->buffer, ret = ftrace_process_regex(parser->buffer,
parser->idx, enable); parser->idx, enable);
if (ret) if (ret)
goto out; goto out_unlock;
trace_parser_clear(parser); trace_parser_clear(parser);
} }
ret = read; ret = read;
out_unlock:
mutex_unlock(&ftrace_regex_lock); mutex_unlock(&ftrace_regex_lock);
out:
return ret; return ret;
} }