From: Li Zefan <lizf@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Jens Axboe <jens.axboe@oracle.com>,
Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/5] blktrace: fix off-by-one bug
Date: Tue, 24 Mar 2009 16:05:27 +0800 [thread overview]
Message-ID: <49C89447.5060303@cn.fujitsu.com> (raw)
In-Reply-To: <49C893FC.9080905@cn.fujitsu.com>
'what' is used as the index of array what2act, so it can't >= the array size.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/trace/blktrace.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 9af4143..0e91caa 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1149,7 +1149,7 @@ static enum print_line_t blk_trace_event_print(struct trace_iterator *iter,
if (!trace_print_context(iter))
return TRACE_TYPE_PARTIAL_LINE;
- if (unlikely(what == 0 || what > ARRAY_SIZE(what2act)))
+ if (unlikely(what == 0 || what >= ARRAY_SIZE(what2act)))
ret = trace_seq_printf(s, "Bad pc action %x\n", what);
else {
const bool long_act = !!(trace_flags & TRACE_ITER_VERBOSE);
@@ -1196,7 +1196,7 @@ static enum print_line_t blk_tracer_print_line(struct trace_iterator *iter)
t = (const struct blk_io_trace *)iter->ent;
what = t->action & ((1 << BLK_TC_SHIFT) - 1);
- if (unlikely(what == 0 || what > ARRAY_SIZE(what2act)))
+ if (unlikely(what == 0 || what >= ARRAY_SIZE(what2act)))
ret = trace_seq_printf(&iter->seq, "Bad pc action %x\n", what);
else {
const bool long_act = !!(trace_flags & TRACE_ITER_VERBOSE);
--
1.5.4.rc3
next prev parent reply other threads:[~2009-03-24 8:05 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-24 8:04 [PATCH 0/5] blktrace: various cleanups and fixes, part 2 Li Zefan
2009-03-24 8:04 ` [PATCH 1/5] blktrace: mark ddir_act and what2act const Li Zefan
2009-03-24 12:12 ` [tip:tracing/blktrace] blktrace: mark ddir_act[] const Li Zefan
2009-03-24 12:49 ` [PATCH 1/5] blktrace: mark ddir_act and what2act const Arnaldo Carvalho de Melo
2009-03-24 8:05 ` [PATCH 2/5] blktrace: fix wrong calculation of RWBS Li Zefan
2009-03-24 12:12 ` [tip:tracing/blktrace] " Li Zefan
2009-03-24 8:05 ` Li Zefan [this message]
2009-03-24 8:27 ` [PATCH 3/5] blktrace: fix off-by-one bug Ingo Molnar
2009-03-24 8:33 ` Li Zefan
2009-03-24 8:41 ` Li Zefan
2009-03-24 8:47 ` Ingo Molnar
2009-03-24 8:50 ` Li Zefan
2009-03-25 1:21 ` Li Zefan
2009-03-25 13:15 ` [tip:tracing/blktrace] " Li Zefan
2009-03-24 8:05 ` [PATCH 4/5] blktrace: fix t_error() Li Zefan
2009-03-24 8:44 ` Ingo Molnar
2009-03-24 12:12 ` [tip:tracing/blktrace] " Li Zefan
2009-03-24 12:51 ` [PATCH 4/5] " Arnaldo Carvalho de Melo
2009-03-24 8:06 ` [PATCH 5/5] blktrace: print human-readable act_mask Li Zefan
2009-03-24 8:39 ` Ingo Molnar
2009-03-24 9:01 ` Li Zefan
2009-03-24 8:39 ` Ingo Molnar
2009-03-24 8:46 ` Li Zefan
2009-03-24 9:43 ` Li Zefan
2009-03-24 9:48 ` Ingo Molnar
2009-03-24 12:12 ` [tip:tracing/blktrace] " Li Zefan
2009-03-24 15:48 ` [PATCH 5/5] " Steven Rostedt
2009-03-24 15:49 ` Steven Rostedt
2009-03-24 15:56 ` Ingo Molnar
2009-03-24 16:04 ` Steven Rostedt
2009-03-24 16:06 ` Steven Rostedt
2009-03-25 2:55 ` Li Zefan
2009-03-24 11:49 ` [PATCH 0/5] blktrace: various cleanups and fixes, part 2 Jens Axboe
2009-03-24 12:10 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49C89447.5060303@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=acme@redhat.com \
--cc=fweisbec@gmail.com \
--cc=jens.axboe@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox