Commit 9d2f6060 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'trace-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull tracing fix from Steven Rostedt:
 "I missed this minor hardening of the kernel in the first pull.

   - Make monitor structures read only"

* tag 'trace-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  rv/monitors: Move monitor structure in rodata
parents af9b3fa1 bfa87ac8
...@@ -27,7 +27,7 @@ struct automaton_wip { ...@@ -27,7 +27,7 @@ struct automaton_wip {
bool final_states[state_max_wip]; bool final_states[state_max_wip];
}; };
static struct automaton_wip automaton_wip = { static const struct automaton_wip automaton_wip = {
.state_names = { .state_names = {
"preemptive", "preemptive",
"non_preemptive" "non_preemptive"
......
...@@ -27,7 +27,7 @@ struct automaton_wwnr { ...@@ -27,7 +27,7 @@ struct automaton_wwnr {
bool final_states[state_max_wwnr]; bool final_states[state_max_wwnr];
}; };
static struct automaton_wwnr automaton_wwnr = { static const struct automaton_wwnr automaton_wwnr = {
.state_names = { .state_names = {
"not_running", "not_running",
"running" "running"
......
...@@ -111,7 +111,7 @@ class Dot2c(Automata): ...@@ -111,7 +111,7 @@ class Dot2c(Automata):
def format_aut_init_header(self): def format_aut_init_header(self):
buff = [] buff = []
buff.append("static struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def)) buff.append("static const struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def))
return buff return buff
def __get_string_vector_per_line_content(self, buff): def __get_string_vector_per_line_content(self, buff):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment