diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-26 18:04:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-26 18:04:21 -0800 |
| commit | 8ae516aa8b8161254d3e402b3348b2a9b8d1efd0 (patch) | |
| tree | 532a8665fb0a60fb62a0a27656a00d8829454cd1 /drivers | |
| parent | Merge branch 'for-linus-bugs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (diff) | |
| parent | ftrace: Fix function graph with loading of modules (diff) | |
| download | linux-dev-8ae516aa8b8161254d3e402b3348b2a9b8d1efd0.tar.xz linux-dev-8ae516aa8b8161254d3e402b3348b2a9b8d1efd0.zip | |
Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"This includes two fixes.
1) is a bug fix that happens when root does the following:
echo function_graph > current_tracer
modprobe foo
echo nop > current_tracer
This causes the ftrace internal accounting to get screwed up and
crashes ftrace, preventing the user from using the function tracer
after that.
2) if a TRACE_EVENT has a string field, and NULL is given for it.
The internal trace event code does a strlen() and strcpy() on the
source of field. If it is NULL it causes the system to oops.
This bug has been there since 2.6.31, but no TRACE_EVENT ever passed
in a NULL to the string field, until now"
* tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ftrace: Fix function graph with loading of modules
tracing: Allow events to have NULL strings
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions