Skip to contentSkip to conversation

tools: perf: fix leaking rec_argv in error cases

PATCH Applied Martin Kepplinger 3 participants 3 messages Sep 13, 2017 – Sep 22, 2017 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools: perf: fix leaking rec_argv in error cases

Let's free the allocated rec_argv in case we return early, in order to avoid leaking memory.

This adds free() at a few very similar places across the tree where it was missing.

---
 tools/perf/builtin-c2c.c       | 1 +
 tools/perf/builtin-mem.c       | 1 +
 tools/perf/builtin-timechart.c | 4 +++-
 tools/perf/builtin-trace.c     | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
tools/perf/builtin-c2c.c +1 -0
index 475999e48f66..bb1ee22bd221 100644
@@ -2732,6 +2732,7 @@ static int perf_c2c__record(int argc, const char **argv)
 		if (!perf_mem_events[j].supported) {
 			pr_err("failed: event '%s' not supported\n",
 			       perf_mem_events[j].name);
+			free(rec_argv);
 			return -1;
 		}
 
tools/perf/builtin-mem.c +1 -0
index 0f15634ef82c..6940490bc3f9 100644
@@ -112,6 +112,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
 		if (!perf_mem_events[j].supported) {
 			pr_err("failed: event '%s' not supported\n",
 			       perf_mem_events__name(j));
+			free(rec_argv);
 			return -1;
 		}
 
tools/perf/builtin-timechart.c +3 -1
index 4e2e61695986..01de01ca14f2 100644
@@ -1732,8 +1732,10 @@ static int timechart__io_record(int argc, const char **argv)
 	if (rec_argv == NULL)
 		return -ENOMEM;
 
-	if (asprintf(&filter, "common_pid != %d", getpid()) < 0)
+	if (asprintf(&filter, "common_pid != %d", getpid()) < 0) {
+		free(rec_argv);
 		return -ENOMEM;
+	}
 
 	p = rec_argv;
 	for (i = 0; i < common_args_nr; i++)
tools/perf/builtin-trace.c +1 -0
index 771ddab94bb0..dd8eec4c755c 100644
@@ -2078,6 +2078,7 @@ static int trace__record(struct trace *trace, int argc, const char **argv)
 			rec_argv[j++] = "syscalls:sys_enter,syscalls:sys_exit";
 		else {
 			pr_err("Neither raw_syscalls nor syscalls events exist.\n");
+			free(rec_argv);
 			return -1;
 		}
 	}
Signature · 1 line
2.11.0
maintainer Applied
#1 lore raw

Em Wed, Sep 13, 2017 at 09:14:19PM +0200, Martin Kepplinger escreveu:

Quoted 5 lines

Let's free the allocated rec_argv in case we return early, in order to avoid leaking memory.

This adds free() at a few very similar places across the tree where it was missing.

Thanks, applied.

- Arnaldo

Quoted 62 lines
---
 tools/perf/builtin-c2c.c       | 1 +
 tools/perf/builtin-mem.c       | 1 +
 tools/perf/builtin-timechart.c | 4 +++-
 tools/perf/builtin-trace.c     | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
tools/perf/builtin-c2c.c +1 -0
index 475999e48f66..bb1ee22bd221 100644
@@ -2732,6 +2732,7 @@ static int perf_c2c__record(int argc, const char **argv)
 		if (!perf_mem_events[j].supported) {
 			pr_err("failed: event '%s' not supported\n",
 			       perf_mem_events[j].name);
+			free(rec_argv);
 			return -1;
 		}
 
tools/perf/builtin-mem.c +1 -0
index 0f15634ef82c..6940490bc3f9 100644
@@ -112,6 +112,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
 		if (!perf_mem_events[j].supported) {
 			pr_err("failed: event '%s' not supported\n",
 			       perf_mem_events__name(j));
+			free(rec_argv);
 			return -1;
 		}
 
tools/perf/builtin-timechart.c +3 -1
index 4e2e61695986..01de01ca14f2 100644
@@ -1732,8 +1732,10 @@ static int timechart__io_record(int argc, const char **argv)
 	if (rec_argv == NULL)
 		return -ENOMEM;
 
-	if (asprintf(&filter, "common_pid != %d", getpid()) < 0)
+	if (asprintf(&filter, "common_pid != %d", getpid()) < 0) {
+		free(rec_argv);
 		return -ENOMEM;
+	}
 
 	p = rec_argv;
 	for (i = 0; i < common_args_nr; i++)
tools/perf/builtin-trace.c +1 -0
index 771ddab94bb0..dd8eec4c755c 100644
@@ -2078,6 +2078,7 @@ static int trace__record(struct trace *trace, int argc, const char **argv)
 			rec_argv[j++] = "syscalls:sys_enter,syscalls:sys_exit";
 		else {
 			pr_err("Neither raw_syscalls nor syscalls events exist.\n");
+			free(rec_argv);
 			return -1;
 		}
 	}
Signature · 1 line
2.11.0
#2 lore raw

[tip:perf/core] perf tools: Fix leaking rec_argv in error cases

In reply to Martin Kepplinger
perf tools: Fix leaking rec_argv in error cases
Commit-ID:  c896f85a7c15ab9d040ffac8b8003e47996602a2
Gitweb:     http://git.kernel.org/tip/c896f85a7c15ab9d040ffac8b8003e47996602a2
Author:     Martin Kepplinger <[email protected]>
AuthorDate: Wed, 13 Sep 2017 21:14:19 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 18 Sep 2017 09:40:21 -0300

perf tools: Fix leaking rec_argv in error cases

Let's free the allocated rec_argv in case we return early, in order to avoid leaking memory.

This adds free() at a few very similar places across the tree where it was missing.

---
 tools/perf/builtin-c2c.c       | 1 +
 tools/perf/builtin-mem.c       | 1 +
 tools/perf/builtin-timechart.c | 4 +++-
 tools/perf/builtin-trace.c     | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
tools/perf/builtin-c2c.c +1 -0
index 475999e..bb1ee22 100644
@@ -2732,6 +2732,7 @@ static int perf_c2c__record(int argc, const char **argv)
 		if (!perf_mem_events[j].supported) {
 			pr_err("failed: event '%s' not supported\n",
 			       perf_mem_events[j].name);
+			free(rec_argv);
 			return -1;
 		}
 
tools/perf/builtin-mem.c +1 -0
index 0f15634..6940490 100644
@@ -112,6 +112,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
 		if (!perf_mem_events[j].supported) {
 			pr_err("failed: event '%s' not supported\n",
 			       perf_mem_events__name(j));
+			free(rec_argv);
 			return -1;
 		}
 
tools/perf/builtin-timechart.c +3 -1
index 4e2e616..01de01c 100644
@@ -1732,8 +1732,10 @@ static int timechart__io_record(int argc, const char **argv)
 	if (rec_argv == NULL)
 		return -ENOMEM;
 
-	if (asprintf(&filter, "common_pid != %d", getpid()) < 0)
+	if (asprintf(&filter, "common_pid != %d", getpid()) < 0) {
+		free(rec_argv);
 		return -ENOMEM;
+	}
 
 	p = rec_argv;
 	for (i = 0; i < common_args_nr; i++)
tools/perf/builtin-trace.c +1 -0
index ee8c6e8..967bd35 100644
@@ -2078,6 +2078,7 @@ static int trace__record(struct trace *trace, int argc, const char **argv)
 			rec_argv[j++] = "syscalls:sys_enter,syscalls:sys_exit";
 		else {
 			pr_err("Neither raw_syscalls nor syscalls events exist.\n");
+			free(rec_argv);
 			return -1;
 		}
 	}