[PATCH 0/2] [GIT PULL][for v2.6.32] tracing: urgent fixes

Ingo,

Please pull the latest tip/tracing/urgent tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/urgent


Lai Jiangshan (1):
ring-buffer: Synchronize resizing buffer with reader lock

Li Zefan (1):
ftrace: Fix unmatched locking in ftrace_regex_write()

----
kernel/trace/ftrace.c | 6 +++---
kernel/trace/ring_buffer.c | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo RemoveThis @vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

From: Li Zefan <lizf DeleteThis @cn.fujitsu.com>

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 DeleteThis @cn.fujitsu.com>
LKML-Reference: <4AEF7F8A.3080300 DeleteThis @cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt DeleteThis @goodmis.org>
---
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;
}

--
1.6.3.3


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo DeleteThis @vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/