From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753264AbcD0PeR (ORCPT ); Wed, 27 Apr 2016 11:34:17 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51000 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752207AbcD0PeP (ORCPT ); Wed, 27 Apr 2016 11:34:15 -0400 Date: Wed, 27 Apr 2016 08:33:36 -0700 From: tip-bot for Colin Ian King Message-ID: Cc: acme@redhat.com, colin.king@canonical.com, linux-kernel@vger.kernel.org, mingo@kernel.org, alexander.shishkin@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org, adrian.hunter@intel.com Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, colin.king@canonical.com, acme@redhat.com, tglx@linutronix.de, adrian.hunter@intel.com, hpa@zytor.com, peterz@infradead.org In-Reply-To: <1461524203-10224-1-git-send-email-colin.king@canonical.com> References: <1461524203-10224-1-git-send-email-colin.king@canonical.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf intel-pt: Fix off-by-one comparison on maximum code Git-Commit-ID: c0664893050cc6b2d8b02d3e035f82fbfd0cd4cf X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c0664893050cc6b2d8b02d3e035f82fbfd0cd4cf Gitweb: http://git.kernel.org/tip/c0664893050cc6b2d8b02d3e035f82fbfd0cd4cf Author: Colin Ian King AuthorDate: Sun, 24 Apr 2016 19:56:43 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 25 Apr 2016 20:35:59 -0300 perf intel-pt: Fix off-by-one comparison on maximum code The check for the maximum code is off-by-one; the current comparison of a code that is INTEL_PT_ERR_MAX will cause the strlcpy to perform an out of bounds array access on the intel_pt_err_msgs array. Fix this with a >= comparison. Signed-off-by: Colin Ian King Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1461524203-10224-1-git-send-email-colin.king@canonical.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c index 9409d01..9c8f15d 100644 --- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c @@ -356,7 +356,7 @@ static const char *intel_pt_err_msgs[] = { int intel_pt__strerror(int code, char *buf, size_t buflen) { - if (code < 1 || code > INTEL_PT_ERR_MAX) + if (code < 1 || code >= INTEL_PT_ERR_MAX) code = INTEL_PT_ERR_UNK; strlcpy(buf, intel_pt_err_msgs[code], buflen); return 0;