[PATCH 1/2 v5] perf sched: fix wrong conversion of task state

From	Tomoki Sekiyama <tomoki.sekiyama.qu@hitachi.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/2 v5] perf sched: fix wrong conversion of task state
Date	2016-08-02 07:40 +0200
Message-ID	<s1AAN-cO-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Currently sched_out_state() converts the prev_state u64 bitmask to a char
using the bitmask as an index, which may cause invalid memory access.
This fixes the issue by using the __ffs() returned value as an index.

Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama.qu@hitachi.com>
Fixes: cdce9d738b91e ("perf sched: Add sched latency profiling")
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: David Ahern <dsahern@gmail.com>
---
 tools/perf/builtin-sched.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 0dfe8df..ce9bef6 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -897,9 +897,10 @@ static int thread_atoms_insert(struct perf_sched *sched, struct thread *thread)
 
 static char sched_out_state(u64 prev_state)
 {
-	const char *str = TASK_STATE_TO_CHAR_STR;
+	const char str[] = TASK_STATE_TO_CHAR_STR;
+	unsigned int bit = prev_state ? __ffs(prev_state) + 1 : 0;
 
-	return str[prev_state];
+	return bit < ARRAY_SIZE(str) - 1 ? str[bit] : '?';
 }
 
 static int
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2 v5] perf sched: fix wrong conversion of task state Tomoki Sekiyama <tomoki.sekiyama.qu@hitachi.com> - 2016-08-02 07:40 +0200
  [PATCH 2/2 v5] perf sched: adapt TASK_STATE_TO_CHAR_STR to the latest kernel Tomoki Sekiyama <tomoki.sekiyama.qu@hitachi.com> - 2016-08-02 07:40 +0200
    Re: [PATCH 2/2 v5] perf sched: adapt TASK_STATE_TO_CHAR_STR to the  latest kernel David Ahern <dsahern@gmail.com> - 2016-08-02 15:30 +0200
    Re: [PATCH 2/2 v5] perf sched: adapt TASK_STATE_TO_CHAR_STR to the  latest kernel Masami Hiramatsu <mhiramat@kernel.org> - 2016-08-02 15:40 +0200
  Re: [PATCH 1/2 v5] perf sched: fix wrong conversion of task state Masami Hiramatsu <mhiramat@kernel.org> - 2016-08-02 15:30 +0200

csiph-web