Skip to content

Commit c4c1dbc

Browse files
keesrostedt
authored andcommitted
tracing: Use memset_startat() to zero struct trace_iterator
In preparation for FORTIFY_SOURCE performing compile-time and run-time field bounds checking for memset(), avoid intentionally writing across neighboring fields. Use memset_startat() to avoid confusing memset() about writing beyond the target struct member. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent f86b0aa commit c4c1dbc

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

kernel/trace/trace.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6706,9 +6706,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
67066706
cnt = PAGE_SIZE - 1;
67076707

67086708
/* reset all but tr, trace, and overruns */
6709-
memset(&iter->seq, 0,
6710-
sizeof(struct trace_iterator) -
6711-
offsetof(struct trace_iterator, seq));
6709+
memset_startat(iter, 0, seq);
67126710
cpumask_clear(iter->started);
67136711
trace_seq_init(&iter->seq);
67146712
iter->pos = -1;

0 commit comments

Comments
 (0)