diff options
| author |   Masami Hiramatsu <mhiramat@kernel.org> | 2022-01-25 23:19:30 +0900 |
|---|---|---|
| committer |   Steven Rostedt (Google) <rostedt@goodmis.org> | 2022-01-27 19:15:45 -0500 |
| commit | 58c5724ec2cdd72b22107ec5de00d90cc4797796 (patch) | |
| tree | 1db63eab3b10ae98723dfd912024a4846ae02ff4 | |
| parent | tracing/histogram: Fix a potential memory leak for kstrdup() (diff) | |
| download | linux-dev-58c5724ec2cdd72b22107ec5de00d90cc4797796.tar.xz linux-dev-58c5724ec2cdd72b22107ec5de00d90cc4797796.zip | |
tracing: Avoid -Warray-bounds warning for __rel_loc macro
Since -Warray-bounds checks the destination size from the type of given
pointer, __assign_rel_str() macro gets warned because it passes the
pointer to the 'u32' field instead of 'trace_event_raw_*' data structure.
Pass the data address calculated from the 'trace_event_raw_*' instead of
'u32' __rel_loc field.
Link: https://lkml.kernel.org/r/20220125233154.dac280ed36944c0c2fe6f3ac@kernel.org
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
[ This did not fix the warning, but is still a nice clean up ]
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
| -rw-r--r-- | include/trace/trace_events.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index 8c6f7c433518..65d927e059d3 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -318,9 +318,10 @@ TRACE_MAKE_SYSTEM_STR(); #define __get_str(field) ((char *)__get_dynamic_array(field)) #undef __get_rel_dynamic_array -#define __get_rel_dynamic_array(field) \ - ((void *)(&__entry->__rel_loc_##field) + \ - sizeof(__entry->__rel_loc_##field) + \ +#define __get_rel_dynamic_array(field) \ + ((void *)__entry + \ + offsetof(typeof(*__entry), __rel_loc_##field) + \ + sizeof(__entry->__rel_loc_##field) + \ (__entry->__rel_loc_##field & 0xffff)) #undef __get_rel_dynamic_array_len |