aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2019-10-11 18:19:17 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-10-12 20:40:50 -0400
commit194c2c74f5532e62c218adeb8e2b683119503907 (patch)
tree968137a7e069521734daacde26c23244ca1c2089 /kernel
parent9ef16693aff8137faa21d16ffe65bb9832d24d71 (diff)
tracing: Get trace_array reference for available_tracers files
As instances may have different tracers available, we need to look at the trace_array descriptor that shows the list of the available tracers for the instance. But there's a race between opening the file and an admin deleting the instance. The trace_array_get() needs to be called before accessing the trace_array. Cc: stable@vger.kernel.org Fixes: 607e2ea167e56 ("tracing: Set up infrastructure to allow tracers for instances") Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 252f79c435f8..fa7d813b04c6 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4355,9 +4355,14 @@ static int show_traces_open(struct inode *inode, struct file *file)
4355 if (tracing_disabled) 4355 if (tracing_disabled)
4356 return -ENODEV; 4356 return -ENODEV;
4357 4357
4358 if (trace_array_get(tr) < 0)
4359 return -ENODEV;
4360
4358 ret = seq_open(file, &show_traces_seq_ops); 4361 ret = seq_open(file, &show_traces_seq_ops);
4359 if (ret) 4362 if (ret) {
4363 trace_array_put(tr);
4360 return ret; 4364 return ret;
4365 }
4361 4366
4362 m = file->private_data; 4367 m = file->private_data;
4363 m->private = tr; 4368 m->private = tr;
@@ -4365,6 +4370,14 @@ static int show_traces_open(struct inode *inode, struct file *file)
4365 return 0; 4370 return 0;
4366} 4371}
4367 4372
4373static int show_traces_release(struct inode *inode, struct file *file)
4374{
4375 struct trace_array *tr = inode->i_private;
4376
4377 trace_array_put(tr);
4378 return seq_release(inode, file);
4379}
4380
4368static ssize_t 4381static ssize_t
4369tracing_write_stub(struct file *filp, const char __user *ubuf, 4382tracing_write_stub(struct file *filp, const char __user *ubuf,
4370 size_t count, loff_t *ppos) 4383 size_t count, loff_t *ppos)
@@ -4395,8 +4408,8 @@ static const struct file_operations tracing_fops = {
4395static const struct file_operations show_traces_fops = { 4408static const struct file_operations show_traces_fops = {
4396 .open = show_traces_open, 4409 .open = show_traces_open,
4397 .read = seq_read, 4410 .read = seq_read,
4398 .release = seq_release,
4399 .llseek = seq_lseek, 4411 .llseek = seq_lseek,
4412 .release = show_traces_release,
4400}; 4413};
4401 4414
4402static ssize_t 4415static ssize_t