Skip to content

Commit 7e2cfbd

Browse files
committed
tracing: Have option files inc the trace array ref count
The option files update the options for a given trace array. For an instance, if the file is opened and the instance is deleted, reading or writing to the file will cause a use after free. Up the ref count of the trace_array when an option file is opened. Link: https://lkml.kernel.org/r/20230907024804.086679464@goodmis.org Link: https://lore.kernel.org/all/1cb3aee2-19af-c472-e265-05176fe9bd84@huawei.com/ Cc: stable@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Zheng Yejian <zhengyejian1@huawei.com> Fixes: 8530dec ("tracing: Add tracing_check_open_get_tr()") Tested-by: Linux Kernel Functional Testing <lkft@linaro.org> Tested-by: Naresh Kamboju <naresh.kamboju@linaro.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 9b37feb commit 7e2cfbd

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

kernel/trace/trace.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8988,12 +8988,33 @@ trace_options_write(struct file *filp, const char __user *ubuf, size_t cnt,
89888988
return cnt;
89898989
}
89908990

8991+
static int tracing_open_options(struct inode *inode, struct file *filp)
8992+
{
8993+
struct trace_option_dentry *topt = inode->i_private;
8994+
int ret;
8995+
8996+
ret = tracing_check_open_get_tr(topt->tr);
8997+
if (ret)
8998+
return ret;
8999+
9000+
filp->private_data = inode->i_private;
9001+
return 0;
9002+
}
9003+
9004+
static int tracing_release_options(struct inode *inode, struct file *file)
9005+
{
9006+
struct trace_option_dentry *topt = file->private_data;
9007+
9008+
trace_array_put(topt->tr);
9009+
return 0;
9010+
}
89919011

89929012
static const struct file_operations trace_options_fops = {
8993-
.open = tracing_open_generic,
9013+
.open = tracing_open_options,
89949014
.read = trace_options_read,
89959015
.write = trace_options_write,
89969016
.llseek = generic_file_llseek,
9017+
.release = tracing_release_options,
89979018
};
89989019

89999020
/*

0 commit comments

Comments
 (0)