[tip:perfcounters/core] perf trace: Fix read_string()

tip-bot for Ingo Molnar
2009-09-03T14:28:56Z

Commit-ID: 6f4596d9312ba5fbf5f3231ef484823c4e684d2e
Gitweb: http://git.kernel.org/tip/6f4596d9312ba5fbf5f3231ef484823c4e684d2e
Author: Ingo Molnar <mingo@elte.hu>
AuthorDate: Thu, 3 Sep 2009 16:22:45 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 3 Sep 2009 16:22:45 +0200

perf trace: Fix read_string()

We did not account for the enclosing \0. Depending on what malloc()
gave us this resulted in corrupted version string printouts.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

---
tools/perf/util/trace-event-read.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index b12e490..a1217a1 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -113,8 +113,11 @@ static char *read_string(void)
}
}

+ /* trailing \0: */
+ i++;
+
/* move the file descriptor to the end of the string */
- r = lseek(input_fd, -(r - (i+1)), SEEK_CUR);
+ r = lseek(input_fd, -(r - i), SEEK_CUR);
if (r < 0)
die("lseek");