Re: [PATCH 01/11] perf metric: Fix some memory leaks

Arnaldo Carvalho de Melo
2020-09-15T12:08:48Z

Em Tue, Sep 15, 2020 at 12:18:09PM +0900, Namhyung Kim escreveu:
> I found some memory leaks while reading the metric code. Some are
> real and others only occur in the error path. When it failed during
> metric or event parsing, it should release all resources properly.

Thanks, applied.

- Arnaldo

> Cc: Kajol Jain <kjain@linux.ibm.com>
> Cc: John Garry <john.garry@huawei.com>
> Cc: Ian Rogers <irogers@google.com>
> Acked-by: Jiri Olsa <jolsa@redhat.com>
> Fixes: b18f3e365019d ("perf stat: Support JSON metrics in perf stat")
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/util/metricgroup.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index d03bac65a3c2..90d14c63babb 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -529,6 +529,9 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter,
> continue;
> strlist__add(me->metrics, s);
> }
> +
> + if (!raw)
> + free(s);
> }
> free(omg);
> }
> @@ -1041,7 +1044,7 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,
> ret = metricgroup__add_metric_list(str, metric_no_group,
> &extra_events, &metric_list, map);
> if (ret)
> - return ret;
> + goto out;
> pr_debug("adding %s\n", extra_events.buf);
> bzero(&parse_error, sizeof(parse_error));
> ret = __parse_events(perf_evlist, extra_events.buf, &parse_error, fake_pmu);
> @@ -1049,11 +1052,11 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,
> parse_events_print_error(&parse_error, extra_events.buf);
> goto out;
> }
> - strbuf_release(&extra_events);
> ret = metricgroup__setup_events(&metric_list, metric_no_merge,
> perf_evlist, metric_events);
> out:
> metricgroup__free_metrics(&metric_list);
> + strbuf_release(&extra_events);
> return ret;
> }
>
> --
> 2.28.0.618.gf4bc123cb7-goog
>

--

- Arnaldo