aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-10 09:03:16 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-10 09:03:16 -0800
commit4ffd4ebf9d19c07285ea8a26d30a17ff28767132 (patch)
treed563023f1764aac5c5232315c356fa258f53dcce /kernel
parent7be72c39544e3973509f1c299d255a67177c7a33 (diff)
parenta8dd2176a8e988e3744e863ac39647a6f59fa900 (diff)
downloadlinaro-lsk-4ffd4ebf9d19c07285ea8a26d30a17ff28767132.tar.gz
Merge tag 'trace-3.8-rc2-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing regression fix from Steven Rostedt: "A change that came in this merge window broke the writing to the trace_options file. It causes garbage to be read during the compare of option names, and breaks setting options via the trace_options file, although options can still be set via the options/<option> files." * tag 'trace-3.8-rc2-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix regression of trace_options file setting
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index e5125677efa..1bbfa044650 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2899,6 +2899,8 @@ tracing_trace_options_write(struct file *filp, const char __user *ubuf,
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
+ buf[cnt] = 0;
+
trace_set_options(buf);
*ppos += cnt;