lkml.org 
[lkml]   [2017]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] perf, tools: Avoid segfault on alias parse error
Em Thu, Aug 17, 2017 at 12:28:16PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Wed, Aug 16, 2017 at 03:02:01PM -0700, Andi Kleen escreveu:
> > +++ b/tools/perf/util/parse-events.h
> > @@ -108,15 +108,17 @@ struct parse_events_error {
> > char *help; /* optional help string */
> > };
> >
> > +/* error field must match parse_events_terms */

Argh, this seems to be the oddity that causes these problems, a void
pointer is passed around and sometimes code thinks it is a
struct_parse_events_evlist pointer, like in

#line 117 "util/parse-events.y" /* yacc.c:1646 */
{
struct parse_events_evlist *data = _data;

parse_events_update_lists((yyvsp[0].head), &data->list);
}
#line 1503 "/tmp/build/perf/util/parse-events-bison.c" /* yacc.c:1646 */

while sometimes it thinks it is something else, like in:

case 52:
#line 496 "util/parse-events.y" /* yacc.c:1646 */
{
struct parse_events_terms *data = _data;
data->terms = (yyvsp[0].head);
}
#line 1931 "/tmp/build/perf/util/parse-events-bison.c" /* yacc.c:1646 */

So it will _not_ set to null a member that it doesn't have, i.e. the
minimal fix is to just have the hunks below, making sure that the error
field is present in both structs. No need to set
parse_event_terms->error to anything, it will be set to null since other
fields are set to something.

Longer term we need to fix this mess wrt that "_data" void pointer...

- Arnaldo

> > struct parse_events_evlist {
> > + struct parse_events_error *error;
> > struct list_head list;
> > int idx;
> > int nr_groups;
> > - struct parse_events_error *error;
> > struct perf_evlist *evlist;
> > };
> >
> > struct parse_events_terms {
> > + struct parse_events_error *error;
> > struct list_head *terms;
> > };
> >
> > --
> > 2.9.4

\
 
 \ /
  Last update: 2017-08-17 18:43    [W:0.053 / U:1.824 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site