BPF List
 help / color / mirror / Atom feed
From: Ian Rogers <irogers@google.com>
To: Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	 Tom Rix <trix@redhat.com>, Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	 Arnaldo Carvalho de Melo <acme@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	 Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Jiri Olsa <jolsa@kernel.org>,  Namhyung Kim <namhyung@kernel.org>,
	Ian Rogers <irogers@google.com>,
	 Adrian Hunter <adrian.hunter@intel.com>,
	Yicong Yang <yangyicong@hisilicon.com>,
	 Jonathan Cameron <jonathan.cameron@huawei.com>,
	Yang Jihong <yangjihong1@huawei.com>,
	 Kan Liang <kan.liang@linux.intel.com>,
	Ming Wang <wangming01@loongson.cn>,
	 Huacai Chen <chenhuacai@kernel.org>,
	Sean Christopherson <seanjc@google.com>,
	 K Prateek Nayak <kprateek.nayak@amd.com>,
	Yanteng Si <siyanteng@loongson.cn>,
	 Yuan Can <yuancan@huawei.com>,
	Ravi Bangoria <ravi.bangoria@amd.com>,
	 James Clark <james.clark@arm.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	llvm@lists.linux.dev,  linux-kernel@vger.kernel.org,
	linux-perf-users@vger.kernel.org,  bpf@vger.kernel.org
Subject: [PATCH v1 13/18] perf svghelper: Avoid memory leak
Date: Fri, 22 Sep 2023 22:35:10 -0700	[thread overview]
Message-ID: <20230923053515.535607-14-irogers@google.com> (raw)
In-Reply-To: <20230923053515.535607-1-irogers@google.com>

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

Signed-off-by: Ian Rogers <irogers@google.com>
---
 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


  parent reply	other threads:[~2023-09-23  5:36 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-23  5:34 [PATCH v1 00/18] clang-tools support in tools Ian Rogers
2023-09-23  5:34 ` [PATCH v1 01/18] gen_compile_commands: Allow the line prefix to still be cmd_ Ian Rogers
2023-09-25 15:49   ` Nick Desaulniers
2023-09-25 16:06     ` Ian Rogers
2023-09-28 14:23       ` Nicolas Schier
2023-10-03 14:31         ` Masahiro Yamada
2023-10-05 22:35           ` Ian Rogers
2023-09-23  5:34 ` [PATCH v1 02/18] gen_compile_commands: Sort output compile commands by file name Ian Rogers
2023-09-25 15:45   ` Nick Desaulniers
2023-09-23  5:35 ` [PATCH v1 03/18] run-clang-tools: Add pass through checks and and header-filter arguments Ian Rogers
2023-09-25 15:43   ` Nick Desaulniers
2023-10-05 22:38     ` Ian Rogers
2023-09-23  5:35 ` [PATCH v1 04/18] perf hisi-ptt: Fix potential memory leak Ian Rogers
2023-09-23  5:35 ` [PATCH v1 05/18] perf bench uprobe: Fix potential use of memory after free Ian Rogers
2023-09-23  5:35 ` [PATCH v1 06/18] perf buildid-cache: Fix use of uninitialized value Ian Rogers
2023-09-23  5:35 ` [PATCH v1 07/18] perf env: Remove unnecessary NULL tests Ian Rogers
2023-09-23  5:35 ` [PATCH v1 08/18] perf jitdump: Avoid memory leak Ian Rogers
2023-09-23  5:35 ` [PATCH v1 09/18] perf mem-events: Avoid uninitialized read Ian Rogers
2023-09-23  5:35 ` [PATCH v1 10/18] perf dlfilter: Be defensive against potential NULL dereference Ian Rogers
2023-09-23  5:35 ` [PATCH v1 11/18] perf hists browser: Reorder variables to reduce padding Ian Rogers
2023-09-23  5:35 ` [PATCH v1 12/18] perf hists browser: Avoid potential NULL dereference Ian Rogers
2023-09-23  5:35 ` Ian Rogers [this message]
2023-09-23  5:35 ` [PATCH v1 14/18] perf parse-events: Fix unlikely memory leak when cloning terms Ian Rogers
2023-09-23  5:35 ` [PATCH v1 15/18] tools api: Avoid potential double free Ian Rogers
2023-09-23  5:35 ` [PATCH v1 16/18] perf trace-event-info: Avoid passing NULL value to closedir Ian Rogers
2023-09-23  5:35 ` [PATCH v1 17/18] perf header: Fix various error path memory leaks Ian Rogers
2023-09-23  5:35 ` [PATCH v1 18/18] perf bpf_counter: Fix a few " Ian Rogers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230923053515.535607-14-irogers@google.com \
    --to=irogers@google.com \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=bpf@vger.kernel.org \
    --cc=chenhuacai@kernel.org \
    --cc=james.clark@arm.com \
    --cc=jolsa@kernel.org \
    --cc=jonathan.cameron@huawei.com \
    --cc=kan.liang@linux.intel.com \
    --cc=kprateek.nayak@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=llvm@lists.linux.dev \
    --cc=mark.rutland@arm.com \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=nathan@kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=pbonzini@redhat.com \
    --cc=peterz@infradead.org \
    --cc=ravi.bangoria@amd.com \
    --cc=seanjc@google.com \
    --cc=siyanteng@loongson.cn \
    --cc=trix@redhat.com \
    --cc=wangming01@loongson.cn \
    --cc=yangjihong1@huawei.com \
    --cc=yangyicong@hisilicon.com \
    --cc=yuancan@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox