summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/mpx.c
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2016-02-26 18:55:31 +0000
committerThomas Gleixner <tglx@linutronix.de>2016-02-26 22:12:47 +0100
commit9bf148cb0812595bfdf5100bd2c07e9bec9c6ef5 (patch)
tree0b72c9925b88bbee706a67b9e8506f4f1219e1a8 /arch/x86/mm/mpx.c
parentbf70e5513dfea29c3682e7eb3dbb45f0723bac09 (diff)
downloadlinux-9bf148cb0812595bfdf5100bd2c07e9bec9c6ef5.tar.gz
linux-9bf148cb0812595bfdf5100bd2c07e9bec9c6ef5.tar.bz2
linux-9bf148cb0812595bfdf5100bd2c07e9bec9c6ef5.zip
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 <colin.king@canonical.com> Acked-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: Borislav Petkov <bp@alien8.de> Cc: "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com> 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 <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/mpx.c')
-rw-r--r--arch/x86/mm/mpx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
index b2fd67da1701..ef05755a1900 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;
}