mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 09:31:09 +00:00
perf parse-events: Fix segfault when event parser gets an error
commit2e828582b8
upstream. parse_events() is often called with parse_events_error set to NULL. Make parse_events_error__handle() not segfault in that case. A subsequent patch changes to avoid passing NULL in the first place. Fixes:43eb05d066
("perf tests: Support 'Track with sched_switch' test for hybrid") Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/r/20220809080702.6921-2-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e8ab87549b
commit
5958ef867b
1 changed files with 11 additions and 3 deletions
|
@ -196,9 +196,12 @@ static int tp_event_has_id(const char *dir_path, struct dirent *evt_dir)
|
|||
void parse_events__handle_error(struct parse_events_error *err, int idx,
|
||||
char *str, char *help)
|
||||
{
|
||||
if (WARN(!str, "WARNING: failed to provide error string\n")) {
|
||||
free(help);
|
||||
return;
|
||||
if (WARN(!str, "WARNING: failed to provide error string\n"))
|
||||
goto out_free;
|
||||
if (!err) {
|
||||
/* Assume caller does not want message printed */
|
||||
pr_debug("event syntax error: %s\n", str);
|
||||
goto out_free;
|
||||
}
|
||||
switch (err->num_errors) {
|
||||
case 0:
|
||||
|
@ -224,6 +227,11 @@ void parse_events__handle_error(struct parse_events_error *err, int idx,
|
|||
break;
|
||||
}
|
||||
err->num_errors++;
|
||||
return;
|
||||
|
||||
out_free:
|
||||
free(str);
|
||||
free(help);
|
||||
}
|
||||
|
||||
struct tracepoint_path *tracepoint_id_to_path(u64 config)
|
||||
|
|
Loading…
Reference in a new issue