From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung.kim@lge.com>,
Namhyung Kim <namhyung@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Steven Rostedt <rostedt@goodmis.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 08/12] tools lib traceevent: Do not link broken field arg for an old ftrace event
Date: Thu, 23 Aug 2012 12:09:52 -0300 [thread overview]
Message-ID: <1345734596-7601-9-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1345734596-7601-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung.kim@lge.com>
Defer linking a newly allocated arg to print_fmt.args until all of its
field is setup so that later access to ->field.name cannot be NULL.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1345618831-9148-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/traceevent/event-parse.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index b7c2c49..33fcd94 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4754,20 +4754,20 @@ int pevent_parse_event(struct pevent *pevent,
struct print_arg *arg, **list;
/* old ftrace had no args */
-
list = &event->print_fmt.args;
for (field = event->format.fields; field; field = field->next) {
arg = alloc_arg();
- *list = arg;
- list = &arg->next;
arg->type = PRINT_FIELD;
arg->field.name = strdup(field->name);
if (!arg->field.name) {
do_warning("failed to allocate field name");
event->flags |= EVENT_FL_FAILED;
+ free_arg(arg);
return -1;
}
arg->field.field = field;
+ *list = arg;
+ list = &arg->next;
}
return 0;
}
--
1.7.1
next prev parent reply other threads:[~2012-08-23 15:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1345734596-7601-1-git-send-email-acme@infradead.org>
2012-08-23 15:09 ` [PATCH 01/12] perf tools: Fix 'No libunwind found' make warning message Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 02/12] perf test: Do not abort tests on error Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 03/12] perf tools: Catch event names from command line Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 04/12] perf tools: Refactor print_event_desc() Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 05/12] perf report: Update event names from header description Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 06/12] perf tools: Add pmu mappings to header information Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 07/12] perf tools: Keep the perf_event_attr on version 3 Arnaldo Carvalho de Melo
2012-08-23 15:09 ` Arnaldo Carvalho de Melo [this message]
2012-08-23 15:09 ` [PATCH 09/12] tools lib traceevent: Introduce pevent_errno Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 10/12] tools lib traceevent: Introduce pevent_strerror Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 11/12] tools lib traceevent: Fix strerror_r() use in pevent_strerror Arnaldo Carvalho de Melo
2012-08-23 15:09 ` [PATCH 12/12] tools lib traceevent: Fix off-by-one bug in pevent_strerror() Arnaldo Carvalho de Melo
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=1345734596-7601-9-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
/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;
as well as URLs for NNTP newsgroup(s).