diff options
| author | Kees Cook <keescook@chromium.org> | 2021-11-18 21:22:17 +0100 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-11-19 02:54:51 +0100 |
| commit | c4c1dbcc09e723295969a62aff401815b7ee15f4 (patch) | |
| tree | 08f09cc6b7516abc2ba752bebb11b3d1685c55e5 /kernel/trace/trace.c | |
| parent | tracing/histogram: Fix UAF in destroy_hist_field() (diff) | |
| download | linux-c4c1dbcc09e723295969a62aff401815b7ee15f4.tar.xz linux-c4c1dbcc09e723295969a62aff401815b7ee15f4.zip | |
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/20211118202217.1285588-1-keescook@chromium.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f9139dc1262c..e3c80cfd4eec 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6706,9 +6706,7 @@ waitagain: cnt = PAGE_SIZE - 1; /* reset all but tr, trace, and overruns */ - memset(&iter->seq, 0, - sizeof(struct trace_iterator) - - offsetof(struct trace_iterator, seq)); + memset_startat(iter, 0, seq); cpumask_clear(iter->started); trace_seq_init(&iter->seq); iter->pos = -1; |