diff options
| author | Linus Torvalds | 2016-05-04 03:02:38 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-05-04 03:02:38 +0200 |
| commit | 83858a701cf3271f81dd321c2a81e5666c6ca8f4 (patch) | |
| tree | dfb6eeff810d88a47de5ee2c161036255cc70c58 /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | tracing: Don't display trigger file for events that can't be enabled (diff) | |
| download | kernel-qcow2-linux-83858a701cf3271f81dd321c2a81e5666c6ca8f4.tar.gz kernel-qcow2-linux-83858a701cf3271f81dd321c2a81e5666c6ca8f4.tar.xz kernel-qcow2-linux-83858a701cf3271f81dd321c2a81e5666c6ca8f4.zip | |
Merge tag 'trace-fixes-v4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt:
"Chunyu Hu noticed that if one writes into the trigger files within the
ftrace subsystem of events that it can cause an oops. This file is
only writable by root, but still is a bug that needs to be fixed"
* tag 'trace-fixes-v4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Don't display trigger file for events that can't be enabled
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_events.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 05ddc0820771..6f965864cc02 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2095,8 +2095,13 @@ event_create_dir(struct dentry *parent, struct trace_event_file *file) trace_create_file("filter", 0644, file->dir, file, &ftrace_event_filter_fops); - trace_create_file("trigger", 0644, file->dir, file, - &event_trigger_fops); + /* + * Only event directories that can be enabled should have + * triggers. + */ + if (!(call->flags & TRACE_EVENT_FL_IGNORE_ENABLE)) + trace_create_file("trigger", 0644, file->dir, file, + &event_trigger_fops); trace_create_file("format", 0444, file->dir, call, &ftrace_event_format_fops); |