Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754335AbbHIDNn (ORCPT ); Sat, 8 Aug 2015 23:13:43 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:35712 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751928AbbHIDNj (ORCPT ); Sat, 8 Aug 2015 23:13:39 -0400 Date: Sun, 9 Aug 2015 12:10:58 +0900 From: Namhyung Kim To: Jiri Olsa Cc: Dean Nelson , mingo@redhat.com, rostedt@goodmis.org, acme@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org Subject: Re: [PATCH] tools lib traceevent: add checks for returned EVENT_ERROR type Message-ID: <20150809031058.GD29295@danjae.kornet> References: <20150803170804.22235.88475.email-sent-by-dnelson@teal> <20150807105910.GE8624@krava.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20150807105910.GE8624@krava.brq.redhat.com> User-Agent: Mutt/1.5.23+102 (2ca89bed6448) (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2028 Lines: 51 On Fri, Aug 07, 2015 at 12:59:10PM +0200, Jiri Olsa wrote: > On Mon, Aug 03, 2015 at 01:08:05PM -0400, Dean Nelson wrote: > > 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 > > --- > > tools/lib/traceevent/event-parse.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c > > index cc25f05..72e2933 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); > > @@ -1940,7 +1943,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok) > > > > type = process_arg_token(event, right, tok, type); > > > > - if (right->type == PRINT_OP && > > + if (type != EVENT_ERROR && right->type == PRINT_OP && I think you'd better put the error check on separate lines. Other than that look good to me. Thanks, Namhyung > > get_op_prio(arg->op.op) < get_op_prio(right->op.op)) { > > struct print_arg tmp; > > -- 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/