diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2018-12-10 13:45:22 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-09 17:38:47 +0100 |
| commit | d642e0b630b0ab681362f46f27fc77a1f51a213e (patch) | |
| tree | dab288c51678dddc6446b3646914744b7fbcc5ef /tools/lib | |
| parent | 47af3cecd561eaea1084d3768759c14fb8be43eb (diff) | |
| download | linux-stable-d642e0b630b0ab681362f46f27fc77a1f51a213e.tar.gz linux-stable-d642e0b630b0ab681362f46f27fc77a1f51a213e.tar.bz2 linux-stable-d642e0b630b0ab681362f46f27fc77a1f51a213e.zip | |
tools lib traceevent: Fix processing of dereferenced args in bprintk events
commit f024cf085c423bac7512479f45c34ee9a24af7ce upstream.
In the case that a bprintk event has a dereferenced pointer that is
stored as a string, and there's more values to process (more args), the
arg was not updated to point to the next arg after processing the
dereferenced pointer, and it screwed up what was to be displayed.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: linux-trace-devel@vger.kernel.org
Cc: stable@vger.kernel.org
Fixes: 37db96bb49629 ("tools lib traceevent: Handle new pointer processing of bprint strings")
Link: http://lkml.kernel.org/r/20181210134522.3f71e2ca@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/traceevent/event-parse.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index ce1e20227c64..75de355a63d6 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -4968,6 +4968,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event if (arg->type == PRINT_BSTRING) { trace_seq_puts(s, arg->string.string); + arg = arg->next; break; } |