From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755188AbcBZVQX (ORCPT ); Fri, 26 Feb 2016 16:16:23 -0500 Received: from torg.zytor.com ([198.137.202.12]:56942 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751505AbcBZVQW (ORCPT ); Fri, 26 Feb 2016 16:16:22 -0500 Date: Fri, 26 Feb 2016 13:15:43 -0800 From: tip-bot for Colin Ian King Message-ID: Cc: kirill.shutemov@linux.intel.com, bp@alien8.de, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, colin.king@canonical.com, tglx@linutronix.de, dave.hansen@linux.intel.com Reply-To: colin.king@canonical.com, dave.hansen@linux.intel.com, tglx@linutronix.de, bp@alien8.de, kirill.shutemov@linux.intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1456512931-3388-1-git-send-email-colin.king@canonical.com> References: <1456512931-3388-1-git-send-email-colin.king@canonical.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/mpx: Fix off-by-one comparison with nr_registers Git-Commit-ID: 9bf148cb0812595bfdf5100bd2c07e9bec9c6ef5 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: 9bf148cb0812595bfdf5100bd2c07e9bec9c6ef5 Gitweb: http://git.kernel.org/tip/9bf148cb0812595bfdf5100bd2c07e9bec9c6ef5 Author: Colin Ian King AuthorDate: Fri, 26 Feb 2016 18:55:31 +0000 Committer: Thomas Gleixner CommitDate: Fri, 26 Feb 2016 22:12:47 +0100 x86/mpx: Fix off-by-one comparison with nr_registers In the unlikely event that regno == nr_registers then we get an array overrun on regoff because the invalid register check is currently off-by-one. Fix this with a check that regno is >= nr_registers instead. Detected with static analysis using CoverityScan. Fixes: fcc7ffd67991 "x86, mpx: Decode MPX instruction to get bound violation information" Signed-off-by: Colin Ian King Acked-by: Dave Hansen Cc: Borislav Petkov Cc: "Kirill A . Shutemov" Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/1456512931-3388-1-git-send-email-colin.king@canonical.com Signed-off-by: Thomas Gleixner --- arch/x86/mm/mpx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c index b2fd67d..ef05755 100644 --- a/arch/x86/mm/mpx.c +++ b/arch/x86/mm/mpx.c @@ -123,7 +123,7 @@ static int get_reg_offset(struct insn *insn, struct pt_regs *regs, break; } - if (regno > nr_registers) { + if (regno >= nr_registers) { WARN_ONCE(1, "decoded an instruction with an invalid register"); return -EINVAL; }