Messages in this thread Patch in this message | | | Date | Tue, 4 Aug 2009 11:37:19 GMT | From | tip-bot for Roel Kluin <> | Subject | [tip:perfcounters/urgent] perf: Fix read buffer overflow |
| |
Commit-ID: 7e030655dda5b5efc4305e2a8f46c4967d32eb3d Gitweb: http://git.kernel.org/tip/7e030655dda5b5efc4305e2a8f46c4967d32eb3d Author: Roel Kluin <roel.kluin@gmail.com> AuthorDate: Sun, 2 Aug 2009 13:43:11 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Tue, 4 Aug 2009 11:09:56 +0200
perf: Fix read buffer overflow
Check whether index is within bounds before testing the element.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: a.p.zijlstra@chello.nl Cc: Andrew Morton <akpm@linux-foundation.org> LKML-Reference: <4A757BCF.40101@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- tools/perf/builtin-report.c | 2 +- tools/perf/util/quote.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 95fd06c..ce4f286 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -253,7 +253,7 @@ static int strcommon(const char *pathname) { int n = 0; - while (pathname[n] == cwd[n] && n < cwdlen) + while (n < cwdlen && pathname[n] == cwd[n]) ++n; return n; diff --git a/tools/perf/util/quote.c b/tools/perf/util/quote.c index c6e5dc0..2726fe4 100644 --- a/tools/perf/util/quote.c +++ b/tools/perf/util/quote.c @@ -318,7 +318,7 @@ char *quote_path_relative(const char *in, int len, strbuf_addch(out, '"'); if (prefix) { int off = 0; - while (prefix[off] && off < len && prefix[off] == in[off]) + while (off < len && prefix[off] && prefix[off] == in[off]) if (prefix[off] == '/') { prefix += off + 1; in += off + 1;
| |