Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb08f8eb authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar
Browse files

blktrace: fix off-by-one bug 



'what' is used as the index of array what2act, so it can't >= the array size.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarJens Axboe <jens.axboe@oracle.com>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 55547204

kernel/trace/blktrace.c

+2 −2
Original line number Diff line number Diff line
@@ -1152,7 +1152,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);
@@ -1199,7 +1199,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);