mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dean Nelson <dnelson@redhat.com>
To: a.p.zijlstra@chello.org, mingo@redhat.com, rostedt@goodmis.org,
	acme@kernel.org
Cc: namhyung@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org
Subject: [PATCH v3] tools lib traceevent: add checks for returned EVENT_ERROR type
Date: Thu, 20 Aug 2015 11:16:32 -0400	[thread overview]
Message-ID: <20150820151632.13927.13791.email-sent-by-dnelson@teal> (raw)

Running the following perf-stat command on an arm64 system produces the
following result...

  [root@aarch64 ~]# perf stat -e kmem:mm_page_alloc -a sleep 1
    Warning: [kmem:mm_page_alloc] function sizeof not defined
    Warning: Error: expected type 4 but read 0
  Segmentation fault
  [root@aarch64 ~]#

The second warning message and SIGSEGV stem from the issue expressed in the
first warning message, and are the result of ignoring the EVENT_ERROR type
returned back through the call chain.

Dealing with the first warning message is beyond the scope of this patch. But
the second warning is addressed by this patch's first hunk. And the SIGSEGV is
eliminated by its second hunk.

Signed-off-by: Dean Nelson <dnelson@redhat.com>
---
Changes in v3:
  - The desire was that a goto be used, not what I'd done in v2.

Changes in v2:
  - Moved the second hunk's check for EVENT_ERROR to a separate line.

 tools/lib/traceevent/event-parse.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index cc25f05..ed765a9 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -1680,6 +1680,9 @@ process_cond(struct event_format *event, struct print_arg *top, char **tok)
 	type = process_arg(event, left, &token);
 
  again:
+	if (type == EVENT_ERROR)
+		goto out_free;
+
 	/* Handle other operations in the arguments */
 	if (type == EVENT_OP && strcmp(token, ":") != 0) {
 		type = process_op(event, left, &token);
@@ -1939,6 +1942,12 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
 			goto out_warn_free;
 
 		type = process_arg_token(event, right, tok, type);
+		if (type == EVENT_ERROR) {
+			free_arg(right);
+			/* token was freed in process_arg_token() via *tok */
+			token = NULL;
+			goto out_free;
+		}
 
 		if (right->type == PRINT_OP &&
 		    get_op_prio(arg->op.op) < get_op_prio(right->op.op)) {

             reply	other threads:[~2015-08-20 15:16 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-20 15:16 Dean Nelson [this message]
2015-08-20 15:57 ` Namhyung Kim
2015-08-20 17:05 ` Steven Rostedt
2015-08-20 17:56   ` Dean Nelson
2015-08-20 19:05     ` Arnaldo Carvalho de Melo
2015-08-20 20:43       ` Steven Rostedt
2015-08-21 13:34 ` Arnaldo Carvalho dn Melo
2015-08-21 14:03   ` Jiri Olsa
2015-08-22  6:52 ` [tip:perf/core] tools lib traceevent: Add " tip-bot for Dean Nelson

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=20150820151632.13927.13791.email-sent-by-dnelson@teal \
    --to=dnelson@redhat.com \
    --cc=a.p.zijlstra@chello.org \
    --cc=acme@kernel.org \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.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

all inboxes | Powered by JetHome®