[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-7e030655dda5b5efc4305e2a8f46c4967d32eb3d@git.kernel.org>
Date: Tue, 4 Aug 2009 11:37:19 GMT
From: tip-bot for Roel Kluin <roel.kluin@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
akpm@...ux-foundation.org, roel.kluin@...il.com,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:perfcounters/urgent] perf: Fix read buffer overflow
Commit-ID: 7e030655dda5b5efc4305e2a8f46c4967d32eb3d
Gitweb: http://git.kernel.org/tip/7e030655dda5b5efc4305e2a8f46c4967d32eb3d
Author: Roel Kluin <roel.kluin@...il.com>
AuthorDate: Sun, 2 Aug 2009 13:43:11 +0200
Committer: Ingo Molnar <mingo@...e.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@...il.com>
Cc: a.p.zijlstra@...llo.nl
Cc: Andrew Morton <akpm@...ux-foundation.org>
LKML-Reference: <4A757BCF.40101@...il.com>
Signed-off-by: Ingo Molnar <mingo@...e.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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists