summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-09-05 14:02:48 +0900
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-09-05 17:46:34 -0300
commit618a3f1d30ea0ee2ff3a88661b8d6a4035123211 (patch)
treeb8576de28fbe9eab9844b67528dacf40a2f10913
parent74ba9e11f02a4ce0c7708dc77d1756b93065e440 (diff)
downloadop-kernel-dev-618a3f1d30ea0ee2ff3a88661b8d6a4035123211.zip
op-kernel-dev-618a3f1d30ea0ee2ff3a88661b8d6a4035123211.tar.gz
perf header: Set tracepoint event name only if not set
The event name can be set already by processing a event_desc data. So check it before setting to prevent possible leak. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1346821373-31621-3-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/util/header.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index a124b93..05c9310 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2314,7 +2314,7 @@ static int perf_evlist__set_tracepoint_names(struct perf_evlist *evlist,
struct perf_evsel *pos;
list_for_each_entry(pos, &evlist->entries, node) {
- if (pos->attr.type == PERF_TYPE_TRACEPOINT &&
+ if (pos->attr.type == PERF_TYPE_TRACEPOINT && !pos->name &&
perf_evsel__set_tracepoint_name(pos, pevent))
return -1;
}
OpenPOWER on IntegriCloud