提交 5859fa1a 编写于 作者: F Filipe Brandenburger 提交者: Steven Rostedt

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 7d536cb3 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.comSigned-off-by: NFilipe Brandenburger <filbranden@google.com>
Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
上级 b2e285fc
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册