Skip to contentSkip to conversation

perf header: Fix bogus group name

PATCH New Namhyung Kim 2 participants 4 messages Nov 18, 2013 – Nov 20, 2013 perf events

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

PATCH 1/2 perf header: Fix bogus group name

From: Namhyung Kim <[email protected]>

When processing event group descriptor in perf file header, we reuse an allocated group name but forgot to prevent it from freeing.

---
 tools/perf/util/header.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/header.c +3 -1
index 369c03648f88..559c516f1cec 100644
@@ -2078,8 +2078,10 @@ static int process_group_desc(struct perf_file_section *section __maybe_unused,
 		if (evsel->idx == (int) desc[i].leader_idx) {
 			evsel->leader = evsel;
 			/* {anon_group} is a dummy name */
-			if (strcmp(desc[i].name, "{anon_group}"))
+			if (strcmp(desc[i].name, "{anon_group}")) {
 				evsel->group_name = desc[i].name;
+				desc[i].name = NULL;
+			}
 			evsel->nr_members = desc[i].nr_members;
 
 			if (i >= nr_groups || nr > 0) {
Signature · 1 line
1.7.11.7
author maintainer
#1 lore raw

PATCH 2/2 perf header: Fix possible memory leaks in process_group_desc()

From: Namhyung Kim <[email protected]>

After processing all group descriptors or encountering an error, it frees all descriptors. However, current logic can leak memory since it might not traverse all descriptors.

Note that the 'i' can have different value than nr_groups when an error occurred and it's safe to call free(desc[i].name) for every desc since we already make it NULL when it's reused for group names.

---
 tools/perf/util/header.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/header.c +1 -1
index 559c516f1cec..1cd035708931 100644
@@ -2107,7 +2107,7 @@ static int process_group_desc(struct perf_file_section *section __maybe_unused,
 
 	ret = 0;
 out_free:
-	while ((int) --i >= 0)
+	for (i = 0; i < nr_groups; i++)
 		free(desc[i].name);
 	free(desc);
 
Signature · 1 line
1.7.11.7
#2 lore raw

[tip:perf/urgent] perf header: Fix possible memory leaks in process_group_desc()

perf header: Fix possible memory leaks in process_group_desc()
Commit-ID:  50a2740b839ece03b305facd3fc07cdc3b74247c
Gitweb:     http://git.kernel.org/tip/50a2740b839ece03b305facd3fc07cdc3b74247c
Author:     Namhyung Kim <[email protected]>
AuthorDate: Mon, 18 Nov 2013 11:20:44 +0900
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 19 Nov 2013 10:34:05 -0300

perf header: Fix possible memory leaks in process_group_desc()

After processing all group descriptors or encountering an error, it frees all descriptors. However, current logic can leak memory since it might not traverse all descriptors.

Note that the 'i' can have different value than nr_groups when an error occurred and it's safe to call free(desc[i].name) for every desc since we already make it NULL when it's reused for group names.

---
 tools/perf/util/header.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/header.c +1 -1
index 559c516..1cd0357 100644
@@ -2107,7 +2107,7 @@ static int process_group_desc(struct perf_file_section *section __maybe_unused,
 
 	ret = 0;
 out_free:
-	while ((int) --i >= 0)
+	for (i = 0; i < nr_groups; i++)
 		free(desc[i].name);
 	free(desc);
 
#3 lore raw
In reply to Namhyung Kim
perf header: Fix bogus group name
Commit-ID:  210e812f036736aeda097d9a6ef84b1f2b334bae
Gitweb:     http://git.kernel.org/tip/210e812f036736aeda097d9a6ef84b1f2b334bae
Author:     Namhyung Kim <[email protected]>
AuthorDate: Mon, 18 Nov 2013 11:20:43 +0900
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 19 Nov 2013 10:33:57 -0300

perf header: Fix bogus group name

When processing event group descriptor in perf file header, we reuse an allocated group name but forgot to prevent it from freeing.

---
 tools/perf/util/header.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/header.c +3 -1
index 369c036..559c516 100644
@@ -2078,8 +2078,10 @@ static int process_group_desc(struct perf_file_section *section __maybe_unused,
 		if (evsel->idx == (int) desc[i].leader_idx) {
 			evsel->leader = evsel;
 			/* {anon_group} is a dummy name */
-			if (strcmp(desc[i].name, "{anon_group}"))
+			if (strcmp(desc[i].name, "{anon_group}")) {
 				evsel->group_name = desc[i].name;
+				desc[i].name = NULL;
+			}
 			evsel->nr_members = desc[i].nr_members;
 
 			if (i >= nr_groups || nr > 0) {