From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756148AbcHBFfy (ORCPT ); Tue, 2 Aug 2016 01:35:54 -0400 Received: from mail7.hitachi.co.jp ([133.145.228.42]:48653 "EHLO mail7.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752037AbcHBFfr (ORCPT ); Tue, 2 Aug 2016 01:35:47 -0400 From: Tomoki Sekiyama To: linux-kernel@vger.kernel.org Cc: masumi.moritani.ju@hitachi.com, Tomoki Sekiyama , Jiri Olsa , David Ahern , Namhyung Kim , Peter Zijlstra , Masami Hiramatsu Subject: [PATCH 1/2 v5] perf sched: fix wrong conversion of task state Date: Tue, 2 Aug 2016 14:35:28 +0900 Message-Id: <1470116129-12380-1-git-send-email-tomoki.sekiyama.qu@hitachi.com> X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: cdce9d738b91e ("perf sched: Add sched latency profiling") Cc: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Masami Hiramatsu Acked-by: David Ahern --- 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