From patchwork Tue Sep 1 16:14:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 52936 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id E23BD2157D for ; Tue, 1 Sep 2015 16:14:43 +0000 (UTC) Received: by lbbti1 with SMTP id ti1sf106070lbb.3 for ; Tue, 01 Sep 2015 09:14:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=3/HnR4gSdX61Ifh8S/fy/+WTB/gQKUWchnR9z5lxgoM=; b=j5eV064c+Xl5qNk/d+IlHg/SjZGHjpHMd3r53rGzs7y1V07/9Evp3ZdedB3mPH7SbR FquqWXMJpC0rYPhwH+cq8VrfF2HHCT6XSnsopEWG4UleO4z6I86VgCetdSFeQJP7gkHp yw36tEEuV97/wSP3uqazPi5Pk4MpJ0f7SLWyg++RcaE3YElRvUHljVzPkijnQbWDawt5 KuCBebw3U+1C5X10wwKP2jWA3Ou7Fk6/HliFKlzkEEkVpuEj2Ea6R8eGgWG+DltTnZAm QqWV9IptU9/wBR+Kkslbr6wRyLHyhf8oGt4rZqR3EF+YKuAfciEWJ7W+1tJJE/R/Kha3 Oh7w== X-Gm-Message-State: ALoCoQlbEoz0svtm6LKUP3h6IWu/ZO71W6cLrwf/WK/rxkzCEpF/vFvZtlaKGmIsblOYyz70xxw3 X-Received: by 10.112.54.166 with SMTP id k6mr7950662lbp.0.1441124082919; Tue, 01 Sep 2015 09:14:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.129 with SMTP id rc1ls345779lac.6.gmail; Tue, 01 Sep 2015 09:14:42 -0700 (PDT) X-Received: by 10.112.129.72 with SMTP id nu8mr9066659lbb.81.1441124082657; Tue, 01 Sep 2015 09:14:42 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id m18si16796203lbg.157.2015.09.01.09.14.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Sep 2015 09:14:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lagj9 with SMTP id j9so526087lag.2 for ; Tue, 01 Sep 2015 09:14:42 -0700 (PDT) X-Received: by 10.152.22.99 with SMTP id c3mr14317502laf.32.1441124082494; Tue, 01 Sep 2015 09:14:42 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.164.42 with SMTP id yn10csp643769lbb; Tue, 1 Sep 2015 09:14:39 -0700 (PDT) X-Received: by 10.68.253.65 with SMTP id zy1mr48227489pbc.159.1441124077780; Tue, 01 Sep 2015 09:14:37 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qn10si30495699pbc.109.2015.09.01.09.14.36; Tue, 01 Sep 2015 09:14:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753110AbbIAQOf (ORCPT + 28 others); Tue, 1 Sep 2015 12:14:35 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:39785 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752023AbbIAQOd (ORCPT ); Tue, 1 Sep 2015 12:14:33 -0400 Received: from [177.35.17.8] (helo=zoo.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZWoCc-0006Fw-AB; Tue, 01 Sep 2015 16:14:30 +0000 Received: by zoo.infradead.org (Postfix, from userid 1000) id 3EFDB220145; Tue, 1 Sep 2015 13:14:27 -0300 (BRT) From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Wang Nan , "David S. Miller" , Zefan Li , pi3orama@huawei.com, Arnaldo Carvalho de Melo Subject: [PATCH 1/3] perf dwarf: Fix potential array out of bounds access Date: Tue, 1 Sep 2015 13:14:02 -0300 Message-Id: <1441124044-20465-2-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1441124044-20465-1-git-send-email-acme@kernel.org> References: <1441124044-20465-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: acme@kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Wang Nan There is a problem in the dwarf-regs.c files for sh, sparc and x86 where it is possible to make an out-of-bounds array access when searching for register names. This patch fixes it by replacing '<=' to '<', so when register (number == XXX_MAX_REGS), get_arch_regstr() will return NULL. Signed-off-by: Wang Nan Reviewed-by: Matt Fleming Acked-by: Jiri Olsa Acked-by: Masami Hiramatsu Cc: David S. Miller Cc: Zefan Li Cc: pi3orama@huawei.com Link: http://lkml.kernel.org/r/1441078184-105038-1-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/sh/util/dwarf-regs.c | 2 +- tools/perf/arch/sparc/util/dwarf-regs.c | 2 +- tools/perf/arch/x86/util/dwarf-regs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/arch/sh/util/dwarf-regs.c b/tools/perf/arch/sh/util/dwarf-regs.c index 0d0897f57a10..f8dfa89696f4 100644 --- a/tools/perf/arch/sh/util/dwarf-regs.c +++ b/tools/perf/arch/sh/util/dwarf-regs.c @@ -51,5 +51,5 @@ const char *sh_regs_table[SH_MAX_REGS] = { /* Return architecture dependent register string (for kprobe-tracer) */ const char *get_arch_regstr(unsigned int n) { - return (n <= SH_MAX_REGS) ? sh_regs_table[n] : NULL; + return (n < SH_MAX_REGS) ? sh_regs_table[n] : NULL; } diff --git a/tools/perf/arch/sparc/util/dwarf-regs.c b/tools/perf/arch/sparc/util/dwarf-regs.c index 92eda412fed3..b704fdb9237a 100644 --- a/tools/perf/arch/sparc/util/dwarf-regs.c +++ b/tools/perf/arch/sparc/util/dwarf-regs.c @@ -39,5 +39,5 @@ const char *sparc_regs_table[SPARC_MAX_REGS] = { */ const char *get_arch_regstr(unsigned int n) { - return (n <= SPARC_MAX_REGS) ? sparc_regs_table[n] : NULL; + return (n < SPARC_MAX_REGS) ? sparc_regs_table[n] : NULL; } diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c index be22dd463232..a08de0a35b83 100644 --- a/tools/perf/arch/x86/util/dwarf-regs.c +++ b/tools/perf/arch/x86/util/dwarf-regs.c @@ -71,5 +71,5 @@ const char *x86_64_regs_table[X86_64_MAX_REGS] = { /* Return architecture dependent register string (for kprobe-tracer) */ const char *get_arch_regstr(unsigned int n) { - return (n <= ARCH_MAX_REGS) ? arch_regs_table[n] : NULL; + return (n < ARCH_MAX_REGS) ? arch_regs_table[n] : NULL; }