tracing: Make ftrace_print_array_seq compute buf_len
Steven Rostedt
maintainerLinus,
The newly added ftrace_print_array_seq() function had a bug in it. Luckily, the only user of it didn't make the 4.1 merge window. But the helper function should be fixed before 4.2 when the users start coming in.
Please pull the latest trace-fixes-v4.1-rc2 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-fixes-v4.1-rc2
Tag SHA1: 2837563611f56822579dd435b241495044e33961 Head SHA1: ac01ce1410fc2c7b5f3af5e9c972e6a412eee54f
Alex Bennée (1):
tracing: Make ftrace_print_array_seq compute buf_len
----
include/linux/ftrace_event.h | 2 +- kernel/trace/trace_output.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) --------------------------- commit ac01ce1410fc2c7b5f3af5e9c972e6a412eee54f Author: Alex Bennée <[email protected]> Date: Wed Apr 29 16:18:46 2015 +0100
tracing: Make ftrace_print_array_seq compute buf_len
The only caller to this function (__print_array) was getting it wrong by passing the array length instead of buffer length. As the element size was already being passed for other reasons it seems reasonable to push the calculation of buffer length into the function.
include/linux/ftrace_event.h +1 -1
@@ -46,7 +46,7 @@ const char *ftrace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int len);const char *ftrace_print_array_seq (struct trace_seq *p, -const void *buf,int buf_len, +const void *buf,int count,size_t el_size);struct trace_iterator ;
kernel/trace/trace_output.c +2 -1
@@ -178,12 +178,13 @@ ftrace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len)EXPORT_SYMBOL (ftrace_print_hex_seq);const char * -ftrace_print_array_seq (struct trace_seq *p,const void *buf,int buf_len, +ftrace_print_array_seq (struct trace_seq *p,const void *buf,int count,size_t el_size) {const char *ret =trace_seq_buffer_ptr (p);const char *prefix ="" ;void *ptr = (void *)buf; +size_t buf_len = count * el_size;trace_seq_putc (p,'{' );