• Namhyung Kim's avatar
    perf metric: Free metric when it failed to resolve · 27adafcd
    Namhyung Kim authored
    The metricgroup__add_metric() can find multiple match for a metric group
    and it's possible to fail.  Also it can fail in the middle like in
    resolve_metric() even for single metric.
    
    In those cases, the intermediate list and ids will be leaked like:
    
      Direct leak of 3 byte(s) in 1 object(s) allocated from:
        #0 0x7f4c938f40b5 in strdup (/lib/x86_64-linux-gnu/libasan.so.5+0x920b5)
        #1 0x55f7e71c1bef in __add_metric util/metricgroup.c:683
        #2 0x55f7e71c31d0 in add_metric util/metricgroup.c:906
        #3 0x55f7e71c3844 in metricgroup__add_metric util/metricgroup.c:940
        #4 0x55f7e71c488d in metricgroup__add_metric_list util/metricgroup.c:993
        #5 0x55f7e71c488d in parse_groups util/metricgroup.c:1045
        #6 0x55f7e71c60a4 in metricgroup__parse_groups_test util/metricgroup.c:1087
        #7 0x55f7e71235ae in __compute_metric tests/parse-metric.c:164
        #8 0x55f7e7124650 in compute_metric tests/parse-metric.c:196
        #9 0x55f7e7124650 in test_recursion_fail tests/parse-metric.c:318
        #10 0x55f7e7124650 in test__parse_metric tests/parse-metric.c:356
        #11 0x55f7e70be09b in run_test tests/builtin-test.c:410
        #12 0x55f7e70be09b in test_and_print tests/builtin-test.c:440
        #13 0x55f7e70c101a in __cmd_test tests/builtin-test.c:661
        #14 0x55f7e70c101a in cmd_test tests/builtin-test.c:807
        #15 0x55f7e7126214 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:312
        #16 0x55f7e6fc41a8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:364
        #17 0x55f7e6fc41a8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:408
        #18 0x55f7e6fc41a8 in main /home/namhyung/project/linux/tools/perf/perf.c:538
        #19 0x7f4c93492cc9 in __libc_start_main ../csu/libc-start.c:308
    
    Fixes: 83de0b7d ("perf metric: Collect referenced metrics in struct metric_ref_node")
    Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
    Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lore.kernel.org/lkml/20200915031819.386559-9-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    27adafcd
metricgroup.c 25.2 KB