perf events parse: Use just one parse events state struct

Andi reported problems when parse errors were detected with vendor
events (json), because in the yyparse/parse_events_parse function we
dereferenced the _data parameter to two different structs, with
different layouts, which ended up making parse_events_evlist->error to
point to random stack addresses.

Fix it by making _data to always be struct parse_events_state, changing
the only place where 'struct parse_events_term' was used in
parse_events.y.
Reported-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-bc27lshz823hxl8n9nkelcgh@git.kernel.org
Fixes: 90e2b22d ("perf/tool: Add support to reuse event grammar to parse out terms")
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5d369a75
...@@ -1656,7 +1656,7 @@ static int parse_events__scanner(const char *str, void *data, int start_token) ...@@ -1656,7 +1656,7 @@ static int parse_events__scanner(const char *str, void *data, int start_token)
*/ */
int parse_events_terms(struct list_head *terms, const char *str) int parse_events_terms(struct list_head *terms, const char *str)
{ {
struct parse_events_terms data = { struct parse_events_state data = {
.terms = NULL, .terms = NULL,
}; };
int ret; int ret;
......
...@@ -114,9 +114,6 @@ struct parse_events_state { ...@@ -114,9 +114,6 @@ struct parse_events_state {
int nr_groups; int nr_groups;
struct parse_events_error *error; struct parse_events_error *error;
struct perf_evlist *evlist; struct perf_evlist *evlist;
};
struct parse_events_terms {
struct list_head *terms; struct list_head *terms;
}; };
......
...@@ -488,7 +488,7 @@ opt_event_config: ...@@ -488,7 +488,7 @@ opt_event_config:
start_terms: event_config start_terms: event_config
{ {
struct parse_events_terms *data = _data; struct parse_events_state *data = _data;
data->terms = $1; data->terms = $1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment