Commit 0d75118c authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Willy Tarreau

tracing: Move mutex to protect against resetting of seq data

commit 1245800c upstream.

The iter->seq can be reset outside the protection of the mutex. So can
reading of user data. Move the mutex up to the beginning of the function.

Fixes: d7350c3f ("tracing/core: make the read callbacks reentrants")
Reported-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent a1f5e915
...@@ -4121,13 +4121,6 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, ...@@ -4121,13 +4121,6 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
struct trace_array *tr = iter->tr; struct trace_array *tr = iter->tr;
ssize_t sret; ssize_t sret;
/* return any leftover data */
sret = trace_seq_to_user(&iter->seq, ubuf, cnt);
if (sret != -EBUSY)
return sret;
trace_seq_init(&iter->seq);
/* copy the tracer to avoid using a global lock all around */ /* copy the tracer to avoid using a global lock all around */
mutex_lock(&trace_types_lock); mutex_lock(&trace_types_lock);
if (unlikely(iter->trace->name != tr->current_trace->name)) if (unlikely(iter->trace->name != tr->current_trace->name))
...@@ -4140,6 +4133,14 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, ...@@ -4140,6 +4133,14 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
* is protected. * is protected.
*/ */
mutex_lock(&iter->mutex); mutex_lock(&iter->mutex);
/* return any leftover data */
sret = trace_seq_to_user(&iter->seq, ubuf, cnt);
if (sret != -EBUSY)
goto out;
trace_seq_init(&iter->seq);
if (iter->trace->read) { if (iter->trace->read) {
sret = iter->trace->read(iter, filp, ubuf, cnt, ppos); sret = iter->trace->read(iter, filp, ubuf, cnt, ppos);
if (sret) if (sret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment