From: "tip-bot for Steven Rostedt (VMware)" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, jolsa@redhat.com, rostedt@goodmis.org,
linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com,
hpa@zytor.com, namhyung@kernel.org
Subject: [tip:perf/core] tools lib traceevent: Fix processing of dereferenced args in bprintk events
Date: Thu, 20 Dec 2018 10:00:13 -0800 [thread overview]
Message-ID: <tip-f024cf085c423bac7512479f45c34ee9a24af7ce@git.kernel.org> (raw)
In-Reply-To: <20181210134522.3f71e2ca@gandalf.local.home>
Commit-ID: f024cf085c423bac7512479f45c34ee9a24af7ce
Gitweb: https://git.kernel.org/tip/f024cf085c423bac7512479f45c34ee9a24af7ce
Author: Steven Rostedt (VMware) <rostedt@goodmis.org>
AuthorDate: Mon, 10 Dec 2018 13:45:22 -0500
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 18 Dec 2018 12:21:44 -0300
tools lib traceevent: Fix processing of dereferenced args in bprintk events
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>
---
tools/lib/traceevent/event-parse.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index a5ed291b8a9f..69a96e39f0ab 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4973,6 +4973,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e
if (arg->type == TEP_PRINT_BSTRING) {
trace_seq_puts(s, arg->string.string);
+ arg = arg->next;
break;
}
prev parent reply other threads:[~2018-12-20 18:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 18:45 [PATCH] tools/lib/traceevent: " Steven Rostedt
2018-12-10 18:48 ` Arnaldo Carvalho de Melo
2018-12-10 21:26 ` Steven Rostedt
2018-12-11 12:29 ` Arnaldo Carvalho de Melo
[not found] ` <20181210210921.A4C862084C@mail.kernel.org>
2018-12-10 21:25 ` Steven Rostedt
2018-12-10 23:03 ` Sasha Levin
2018-12-20 18:00 ` tip-bot for Steven Rostedt (VMware) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-f024cf085c423bac7512479f45c34ee9a24af7ce@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®