Skip to content

Commit 7ab215f

Browse files
mhiramatrostedt
authored andcommitted
tracing: Clear trace_state when starting trace
Clear trace_state data structure when starting trace in __synth_event_trace_start() internal function. Currently trace_state is initialized only in the synth_event_trace_start() API, but the trace_state in synth_event_trace() and synth_event_trace_array() are on the stack without initialization. This means those APIs will see wrong parameters and wil skip closing process in __synth_event_trace_end() because trace_state->disabled may be !0. Link: http://lkml.kernel.org/r/158193315899.8868.1781259176894639952.stgit@devnote2 Reviewed-by: Tom Zanussi <[email protected]> Signed-off-by: Masami Hiramatsu <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent 08d9e68 commit 7ab215f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/trace/trace_events_hist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,6 +1824,8 @@ __synth_event_trace_start(struct trace_event_file *file,
18241824
int entry_size, fields_size = 0;
18251825
int ret = 0;
18261826

1827+
memset(trace_state, '\0', sizeof(*trace_state));
1828+
18271829
/*
18281830
* Normal event tracing doesn't get called at all unless the
18291831
* ENABLED bit is set (which attaches the probe thus allowing
@@ -2063,8 +2065,6 @@ int synth_event_trace_start(struct trace_event_file *file,
20632065
if (!trace_state)
20642066
return -EINVAL;
20652067

2066-
memset(trace_state, '\0', sizeof(*trace_state));
2067-
20682068
ret = __synth_event_trace_start(file, trace_state);
20692069
if (ret == -ENOENT)
20702070
ret = 0; /* just disabled, not really an error */

0 commit comments

Comments
 (0)