This is a note to let you know that I've just added the patch titled
tracing: Have event inject files inc the trace array ref count
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tracing-have-event-inject-files-inc-the-trace-array-ref-count.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e5c624f027ac74f97e97c8f36c69228ac9f1102d Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Google)" <rostedt@xxxxxxxxxxx>
Date: Wed, 6 Sep 2023 22:47:16 -0400
Subject: tracing: Have event inject files inc the trace array ref count
From: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
commit e5c624f027ac74f97e97c8f36c69228ac9f1102d upstream.
The event inject files add events for a specific 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 a event inject file is opened.
Link: https://lkml.kernel.org/r/20230907024804.292337868@xxxxxxxxxxx
Link: https://lore.kernel.org/all/1cb3aee2-19af-c472-e265-05176fe9bd84@xxxxxxxxxx/
Cc: stable@xxxxxxxxxxxxxxx
Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Zheng Yejian <zhengyejian1@xxxxxxxxxx>
Fixes: 6c3edaf9fd6a ("tracing: Introduce trace event injection")
Tested-by: Linux Kernel Functional Testing <lkft@xxxxxxxxxx>
Tested-by: Naresh Kamboju <naresh.kamboju@xxxxxxxxxx>
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/trace/trace_events_inject.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/kernel/trace/trace_events_inject.c
+++ b/kernel/trace/trace_events_inject.c
@@ -328,7 +328,8 @@ event_inject_read(struct file *file, cha
}
const struct file_operations event_inject_fops = {
- .open = tracing_open_generic,
+ .open = tracing_open_file_tr,
.read = event_inject_read,
.write = event_inject_write,
+ .release = tracing_release_file_tr,
};
Patches currently in stable-queue which might be from rostedt@xxxxxxxxxxx are
queue-6.1/tracing-increase-trace-array-ref-count-on-enable-and-filter-files.patch
queue-6.1/tracefs-add-missing-lockdown-check-to-tracefs_create_dir.patch
queue-6.1/selftests-tracing-fix-to-unmount-tracefs-for-recover.patch
queue-6.1/tracing-have-event-inject-files-inc-the-trace-array-ref-count.patch
queue-6.1/tracing-have-current_trace-inc-the-trace-array-ref-count.patch
queue-6.1/tracing-have-option-files-inc-the-trace-array-ref-count.patch
queue-6.1/tracing-have-tracing_max_latency-inc-the-trace-array-ref-count.patch
