[PATCH v1 13/18] perf svghelper: Avoid memory leak

From: Ian Rogers
Date: Sat Sep 23 2023 - 01:37:05 EST


On success path the sib_core and sib_thr values weren't being
freed. Detected by clang-tidy.

Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
---
tools/perf/builtin-lock.c | 1 +
tools/perf/util/svghelper.c | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index d4b22313e5fc..1b40b00c9563 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -2463,6 +2463,7 @@ static int parse_call_stack(const struct option *opt __maybe_unused, const char
entry = malloc(sizeof(*entry) + strlen(tok) + 1);
if (entry == NULL) {
pr_err("Memory allocation failure\n");
+ free(s);
return -1;
}

diff --git a/tools/perf/util/svghelper.c b/tools/perf/util/svghelper.c
index 0e4dc31c6c9c..1892e9b6aa7f 100644
--- a/tools/perf/util/svghelper.c
+++ b/tools/perf/util/svghelper.c
@@ -754,6 +754,7 @@ int svg_build_topology_map(struct perf_env *env)
int i, nr_cpus;
struct topology t;
char *sib_core, *sib_thr;
+ int ret = -1;

nr_cpus = min(env->nr_cpus_online, MAX_NR_CPUS);

@@ -799,11 +800,11 @@ int svg_build_topology_map(struct perf_env *env)

scan_core_topology(topology_map, &t, nr_cpus);

- return 0;
+ ret = 0;

exit:
zfree(&t.sib_core);
zfree(&t.sib_thr);

- return -1;
+ return ret;
}
--
2.42.0.515.g380fc7ccd1-goog