Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf parse-events: Fix segfault when event parser gets an error

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: 43eb05d066795bdf ("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>

authored by

Adrian Hunter and committed by
Arnaldo Carvalho de Melo
2e828582 b39c9e1b

+11 -3
+11 -3
tools/perf/util/parse-events.c
··· 2256 2256 void parse_events_error__handle(struct parse_events_error *err, int idx, 2257 2257 char *str, char *help) 2258 2258 { 2259 - if (WARN(!str, "WARNING: failed to provide error string\n")) { 2260 - free(help); 2261 - return; 2259 + if (WARN(!str, "WARNING: failed to provide error string\n")) 2260 + goto out_free; 2261 + if (!err) { 2262 + /* Assume caller does not want message printed */ 2263 + pr_debug("event syntax error: %s\n", str); 2264 + goto out_free; 2262 2265 } 2263 2266 switch (err->num_errors) { 2264 2267 case 0: ··· 2287 2284 break; 2288 2285 } 2289 2286 err->num_errors++; 2287 + return; 2288 + 2289 + out_free: 2290 + free(str); 2291 + free(help); 2290 2292 } 2291 2293 2292 2294 #define MAX_WIDTH 1000