diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-14 17:50:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-14 17:50:55 (GMT) |
| commit | 3c91930f0cbd54d522d8844b221c36199a2dc11e (patch) | |
| tree | b505e2c70afd0dcf8704bfdd91e3d5011f7ccc46 /kernel/trace/trace_stack.c | |
| parent | 935d8aabd4331f47a89c3e1daa5779d23cf244ee (diff) | |
| parent | 7f49ef69db6bbf756c0abca7e9b65b32e999eec8 (diff) | |
| download | linux-fsl-qoriq-3c91930f0cbd54d522d8844b221c36199a2dc11e.tar.xz | |
Merge tag 'trace-fixes-v3.9-rc-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull ftrace fixes from Steven Rostedt:
"Namhyung Kim found and fixed a bug that can crash the kernel by simply
doing: echo 1234 | tee -a /sys/kernel/debug/tracing/set_ftrace_pid
Luckily, this can only be done by root, but still is a nasty bug."
* tag 'trace-fixes-v3.9-rc-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section
tracing: Fix possible NULL pointer dereferences
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 42ca822..83a8b5b 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -322,7 +322,7 @@ static const struct file_operations stack_trace_filter_fops = { .open = stack_trace_filter_open, .read = seq_read, .write = ftrace_filter_write, - .llseek = ftrace_regex_lseek, + .llseek = ftrace_filter_lseek, .release = ftrace_regex_release, }; |