From: Steven Rostedt (Red Hat) Date: Sat, 24 Sep 2016 02:57:13 +0000 (-0400) Subject: tracing: Move mutex to protect against resetting of seq data X-Git-Tag: v3.2.84~15 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6711e36bb98f8538cadf8759a232cf49161fee6;p=pandora-kernel.git tracing: Move mutex to protect against resetting of seq data commit 1245800c0f96eb6ebb368593e251d66c01e61022 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: d7350c3f45694 ("tracing/core: make the read callbacks reentrants") Reported-by: Al Viro Signed-off-by: Steven Rostedt [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings --- diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f4b93a207026..ca7396e4aff4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3331,13 +3331,6 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, static struct tracer *old_tracer; 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 */ mutex_lock(&trace_types_lock); if (unlikely(old_tracer != current_trace && current_trace)) { @@ -3352,6 +3345,14 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, * is protected. */ 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) { sret = iter->trace->read(iter, filp, ubuf, cnt, ppos); if (sret)