Messages in this thread Patch in this message | | | Date | Tue, 03 Nov 2009 08:55:38 +0800 | From | Li Zefan <> | Subject | [PATCH 1/3] ftrace: Fix unmatching locking in ftrace_regex_write() |
| |
# 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> ---
This patch is for .32
--- 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 1ed514f..7cb6f19 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2199,15 +2199,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; } -- 1.6.3
| |