perf session: Free cpu_map in perf_session__cpu_bitmap

Stanislav Fomichev · acmel · commit 8bac41cbfe2e · 2014-01-20T16:19:08.000-03:00
This method uses a temporary struct cpu_map to figure out the cpus present in the received cpu list in string form, but it failed to free it after returning. Fix it. Signed-off-by: Stanislav Fomichev <stfomichev@yandex-team.ru> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1390217980-22424-3-git-send-email-stfomichev@yandex-team.ru [ Use goto + err = -1 to do the delete just once, in the normal exit path ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
@@ -1573,7 +1573,7 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample,
 int perf_session__cpu_bitmap(struct perf_session *session,
 			     const char *cpu_list, unsigned long *cpu_bitmap)
 {
-	int i;
+	int i, err = -1;
 	struct cpu_map *map;
 
 	for (i = 0; i < PERF_TYPE_MAX; ++i) {
@@ -1602,13 +1602,17 @@ int perf_session__cpu_bitmap(struct perf_session *session,
 		if (cpu >= MAX_NR_CPUS) {
 			pr_err("Requested CPU %d too large. "
 			       "Consider raising MAX_NR_CPUS\n", cpu);
-			return -1;
+			goto out_delete_map;
 		}
 
 		set_bit(cpu, cpu_bitmap);
 	}
 
-	return 0;
+	err = 0;
+
+out_delete_map:
+	cpu_map__delete(map);
+	return err;
 }
 
 void perf_session__fprintf_info(struct perf_session *session, FILE *fp,

Original file line number	Diff line number	Diff line change
`@@ -1573,7 +1573,7 @@ void perf_evsel__print_ip(struct perf_evsel evsel, struct perf_sample sample,`
`1573`	`1573`	`int perf_session__cpu_bitmap(struct perf_session *session,`
`1574`	`1574`	`const char cpu_list, unsigned long cpu_bitmap)`
`1575`	`1575`	`{`
`1576`		`- int i;`
	`1576`	`+ int i, err = -1;`
`1577`	`1577`	`struct cpu_map *map;`
`1578`	`1578`
`1579`	`1579`	`for (i = 0; i < PERF_TYPE_MAX; ++i) {`
`@@ -1602,13 +1602,17 @@ int perf_session__cpu_bitmap(struct perf_session *session,`
`1602`	`1602`	`if (cpu >= MAX_NR_CPUS) {`
`1603`	`1603`	`pr_err("Requested CPU %d too large. "`
`1604`	`1604`	`"Consider raising MAX_NR_CPUS\n", cpu);`
`1605`		`- return -1;`
	`1605`	`+ goto out_delete_map;`
`1606`	`1606`	`}`
`1607`	`1607`
`1608`	`1608`	`set_bit(cpu, cpu_bitmap);`
`1609`	`1609`	`}`
`1610`	`1610`
`1611`		`- return 0;`
	`1611`	`+ err = 0;`
	`1612`	`+`
	`1613`	`+out_delete_map:`
	`1614`	`+ cpu_map__delete(map);`
	`1615`	`+ return err;`
`1612`	`1616`	`}`
`1613`	`1617`
`1614`	`1618`	`void perf_session__fprintf_info(struct perf_session session, FILE fp,`