diff options
| author | Robert Richter <robert.richter@amd.com> | 2011-12-07 10:02:52 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-12-23 16:57:41 -0200 |
| commit | 002c4fd92d772becf8745b9cbcebe5c95fe6dad0 (patch) | |
| tree | c1e740bbefb3a91ee64315a419835cd28540bb35 /tools/perf | |
| parent | f7a8a1336416883dc0ccd96c17c604e34de61c25 (diff) | |
| download | op-kernel-dev-002c4fd92d772becf8745b9cbcebe5c95fe6dad0.zip op-kernel-dev-002c4fd92d772becf8745b9cbcebe5c95fe6dad0.tar.gz | |
perf tools: Fix out-of-bound access to struct perf_session
If filename is NULL there is an out-of-bound access to struct
perf_session if it would be used with perf_session__open(). Shouldn't
actually happen in current implementation as filename is always !NULL.
Fixing this by always null-terminating filename.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1323248577-11268-3-git-send-email-robert.richter@amd.com
Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/session.c | 2 | ||||
| -rw-r--r-- | tools/perf/util/session.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index d9318d8..ea17dfb 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -107,7 +107,7 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool force, bool repipe, struct perf_tool *tool) { - size_t len = filename ? strlen(filename) + 1 : 0; + size_t len = filename ? strlen(filename) : 0; struct perf_session *self = zalloc(sizeof(*self) + len); if (self == NULL) diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index fb69612..37bc383 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -50,7 +50,7 @@ struct perf_session { int cwdlen; char *cwd; struct ordered_samples ordered_samples; - char filename[0]; + char filename[1]; }; struct perf_tool; |
