aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-08-02 13:43:11 +0200
committerIngo Molnar <mingo@elte.hu>2009-08-04 11:09:56 +0200
commit7e030655dda5b5efc4305e2a8f46c4967d32eb3d (patch)
tree76afe22fedb4914718b8962f86203d8a06ff166d
parent59b9005692d4c8b5d73cfc41aa7229f47be163a9 (diff)
downloadkernel_samsung_smdk4412-7e030655dda5b5efc4305e2a8f46c4967d32eb3d.zip
kernel_samsung_smdk4412-7e030655dda5b5efc4305e2a8f46c4967d32eb3d.tar.gz
kernel_samsung_smdk4412-7e030655dda5b5efc4305e2a8f46c4967d32eb3d.tar.bz2
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>
-rw-r--r--tools/perf/builtin-report.c2
-rw-r--r--tools/perf/util/quote.c2
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;