perf session: Fill in the missing freeing a session after an error occur

When an error occur a error value is just returned without freeing the session. So allocating and freeing session have to be matched as a pair even if an error occur.

Signed-off-by Taeung Song <[email protected]>

---
 tools/perf/builtin-inject.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

tools/perf/builtin-inject.c +4 -3

index 52ec66b..01b0649 100644
@@ -630,12 +630,13 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
 	if (inject.session == NULL)
 		return -1;
 
-	if (symbol__init(&inject.session->header.env) < 0)
-		return -1;
+	ret = symbol__init(&inject.session->header.env);
+	if (ret < 0)
+		goto out_delete;
 
 	ret = __cmd_inject(&inject);
 
+out_delete:
 	perf_session__delete(inject.session);
-
 	return ret;
 }

Signature · 1 line

1.9.1

When an error occur a error value is just returned without freeing the session. So allocating and freeing session have to be matched as a pair even if an error occur.

Signed-off-by Taeung Song <[email protected]>

---
 tools/perf/builtin-kmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

tools/perf/builtin-kmem.c +2 -2

index 950f296..23b1faa 100644
@@ -1916,7 +1916,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
 		if (!perf_evlist__find_tracepoint_by_name(session->evlist,
 							  "kmem:kmalloc")) {
 			pr_err(errmsg, "slab", "slab");
-			return -1;
+			goto out_delete;
 		}
 	}
 

@@ -1927,7 +1927,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
 							     "kmem:mm_page_alloc");
 		if (evsel == NULL) {
 			pr_err(errmsg, "page", "page");
-			return -1;
+			goto out_delete;
 		}
 
 		kmem_page_size = pevent_get_page_size(evsel->tp_format->pevent);

Signature · 1 line

1.9.1

When an error occur a error value is just returned without freeing the session. So allocating and freeing session have to be matched as a pair even if an error occur.

Signed-off-by Taeung Song <[email protected]>

---
 tools/perf/builtin-kvm.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

tools/perf/builtin-kvm.c +4 -2

index 74878cd..5fa96a0 100644
@@ -1061,8 +1061,10 @@ static int read_events(struct perf_kvm_stat *kvm)
 
 	symbol__init(&kvm->session->header.env);
 
-	if (!perf_session__has_traces(kvm->session, "kvm record"))
-		return -EINVAL;
+	if (!perf_session__has_traces(kvm->session, "kvm record")) {
+		ret = -EINVAL;
+		goto out_delete;
+	}
 
 	/*
 	 * Do not use 'isa' recorded in kvm_exit tracepoint since it is not

tools/perf/builtin-kvm.c +4 -0

+
+out_delete:
+	perf_session__delete(kvm->session);
+	return ret;
 }
 
 static int parse_target_str(struct perf_kvm_stat *kvm)

Signature · 1 line

1.9.1

When an error occur a error value is just returned without freeing the session. So allocating and freeing session have to be matched as a pair even if an error occur.

Signed-off-by Taeung Song <[email protected]>

---
 tools/perf/builtin-mem.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

tools/perf/builtin-mem.c +6 -3

index da2ec06..8b6d473 100644
@@ -135,24 +135,27 @@ static int report_raw_events(struct perf_mem *mem)
 	if (mem->cpu_list) {
 		ret = perf_session__cpu_bitmap(session, mem->cpu_list,
 					       mem->cpu_bitmap);
-		if (ret)
+		if (ret) {
+			ret = err;
 			goto out_delete;
+		}
 	}
 
-	if (symbol__init(&session->header.env) < 0)
-		return -1;
+	ret = symbol__init(&session->header.env);
+	if (ret < 0)
+		goto out_delete;
 

tools/perf/builtin-mem.c +1 -1

 out_delete:
 	perf_session__delete(session);
-	return err;
+	return ret;
 }
 
 static int report_events(int argc, const char **argv, struct perf_mem *mem)

Signature · 1 line

1.9.1

When an error occur a error value is just returned without freeing the session. So allocating and freeing session have to be matched as a pair even if an error occur.

Signed-off-by Taeung Song <[email protected]>

---
 tools/perf/builtin-report.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

tools/perf/builtin-report.c +4 -2

index 32626ea..610d056 100644
@@ -828,8 +828,10 @@ repeat:
 	if (report.header || report.header_only) {
 		perf_session__fprintf_info(session, stdout,
 					   report.show_full_info);
-		if (report.header_only)
-			return 0;
+		if (report.header_only) {
+			ret = 0;
+			goto error;
+		}
 	} else if (use_browser == 0) {
 		fputs("# To display the perf.data header info, please use --header/--header-only options.\n#\n",
 		      stdout);

Signature · 1 line

1.9.1