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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue,  2 Aug 2016 14:35:28 +0900
From:	Tomoki Sekiyama <tomoki.sekiyama.qu@...achi.com>
To:	linux-kernel@...r.kernel.org
Cc:	masumi.moritani.ju@...achi.com,
	Tomoki Sekiyama <tomoki.sekiyama.qu@...achi.com>,
	Jiri Olsa <jolsa@...nel.org>, David Ahern <dsahern@...il.com>,
	Namhyung Kim <namhyung@...nel.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Masami Hiramatsu <mhiramat@...nel.org>
Subject: [PATCH 1/2 v5] perf sched: fix wrong conversion of task state

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@...achi.com>
Fixes: cdce9d738b91e ("perf sched: Add sched latency profiling")
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: David Ahern <dsahern@...il.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Masami Hiramatsu <mhiramat@...nel.org>
Acked-by: David Ahern <dsahern@...il.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