diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2014-03-01 05:32:16 (GMT) |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-03-07 15:06:10 (GMT) |
| commit | 5859fa1a146ef5bf79953767f4ceb546fe4214b3 (patch) | |
| tree | 7e46fd7e6faa3baa903a5b3fea1649b7d5d7d6bc /include/trace/ftrace.h | |
| parent | b2e285fcb46ab4d91ebbc3a9bd5900f544972a47 (diff) | |
| download | linux-5859fa1a146ef5bf79953767f4ceb546fe4214b3.tar.xz | |
tracing: Correctly expand len expressions from __dynamic_array macro
This fixes expansion of the len argument in __dynamic_array macros.
The previous code from commit 7d536cb3f would not fully evaluate the
expression before multiplying its result by the size of the type.
This went unnoticed because the length stored in the high 16 bits of the
offset (which is the one that was broken here) is only used by
filter_pred_strloc which only acts on strings for which the size of the
type is 1.
Link: http://lkml.kernel.org/r/1393651938-16418-2-git-send-email-filbranden@google.com
Signed-off-by: Filipe Brandenburger <filbranden@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/trace/ftrace.h')
| -rw-r--r-- | include/trace/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 1cc2265..2125005 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -363,7 +363,7 @@ ftrace_define_fields_##call(struct ftrace_event_call *event_call) \ #define __dynamic_array(type, item, len) \ __data_offsets->item = __data_size + \ offsetof(typeof(*entry), __data); \ - __data_offsets->item |= (len * sizeof(type)) << 16; \ + __data_offsets->item |= ((len) * sizeof(type)) << 16; \ __data_size += (len) * sizeof(type); #undef __string |