Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753340AbbHVGxD (ORCPT ); Sat, 22 Aug 2015 02:53:03 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60106 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751545AbbHVGxA (ORCPT ); Sat, 22 Aug 2015 02:53:00 -0400 Date: Fri, 21 Aug 2015 23:52:39 -0700 From: tip-bot for Dean Nelson Message-ID: Cc: mingo@kernel.org, rostedt@goodmis.org, namhyung@kernel.org, dnelson@redhat.com, jolsa@kernel.org, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org Reply-To: acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, namhyung@kernel.org, rostedt@goodmis.org, mingo@kernel.org, jolsa@kernel.org, dnelson@redhat.com In-Reply-To: <20150820151632.13927.13791.email-sent-by-dnelson@teal> References: <20150820151632.13927.13791.email-sent-by-dnelson@teal> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent: Add checks for returned EVENT_ERROR type Git-Commit-ID: 6f56e9cf581c6cedcaea3eb69444b169867ccf3d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2671 Lines: 68 Commit-ID: 6f56e9cf581c6cedcaea3eb69444b169867ccf3d Gitweb: http://git.kernel.org/tip/6f56e9cf581c6cedcaea3eb69444b169867ccf3d Author: Dean Nelson AuthorDate: Thu, 20 Aug 2015 11:16:32 -0400 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 21 Aug 2015 10:35:09 -0300 tools lib traceevent: Add checks for returned EVENT_ERROR type 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 was a result of the first warning not stopping processing after it detected the issue. That is, code that found the issue reported the first problem, but because it did not exit out of the functions smoothly, it caused the other warning to appear and not only that, it later caused the SIGSEGV. Signed-off-by: Dean Nelson Reviewed-by: Steven Rostedt Acked-by: Namhyung Kim Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20150820151632.13927.13791.email-sent-by-dnelson@teal Signed-off-by: Arnaldo Carvalho de Melo --- 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 fcd8a9e..5c1867a 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -1745,6 +1745,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); @@ -2004,6 +2007,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)) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/