binutils: CVE-2017-9749

Source: binutils-gdb.git
MR: 74010
Type: Security Fix
Disposition: Backport from binutils-2_29
ChangeID: 5b89fbcab899af53585b61bd40724a38bff831d3
Description:

  Prevent invalid array accesses when disassembling a corrupt bfin binary.

        PR binutils/21586
        * bfin-dis.c (gregs): Clip index to prevent overflow.
        (regs): Likewise.
        (regs_lo): Likewise.
        (regs_hi): Likewise.

Affects: <= 2.28
Author: Nick Clifton <nickc@redhat.com>
(From OE-Core rev: 3306cbace5069e58bb62f31ec91ca805410bd949)

Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com>
Reviewed-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Thiruvadi Rajaraman
2017-09-21 19:06:01 +05:30
committed by Richard Purdie
parent 321f980a1e
commit b5093a5c87
2 changed files with 76 additions and 0 deletions

View File

@@ -79,6 +79,7 @@ SRC_URI = "\
file://CVE-2017-7299_1.patch \
file://CVE-2017-7299_2.patch \
file://CVE-2017-9751.patch \
file://CVE-2017-9749.patch \
"
S = "${WORKDIR}/git"

View File

@@ -0,0 +1,75 @@
commit 08c7881b814c546efc3996fd1decdf0877f7a779
Author: Nick Clifton <nickc@redhat.com>
Date: Thu Jun 15 11:52:02 2017 +0100
Prevent invalid array accesses when disassembling a corrupt bfin binary.
PR binutils/21586
* bfin-dis.c (gregs): Clip index to prevent overflow.
(regs): Likewise.
(regs_lo): Likewise.
(regs_hi): Likewise.
Upstream-Status: Backport
CVE: CVE-2017-9749
Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com>
Index: git/opcodes/bfin-dis.c
===================================================================
--- git.orig/opcodes/bfin-dis.c 2017-09-21 13:53:52.667168259 +0530
+++ git/opcodes/bfin-dis.c 2017-09-21 13:54:00.603231339 +0530
@@ -350,7 +350,7 @@
REG_P0, REG_P1, REG_P2, REG_P3, REG_P4, REG_P5, REG_SP, REG_FP,
};
-#define gregs(x, i) REGNAME (decode_gregs[((i) << 3) | (x)])
+#define gregs(x, i) REGNAME (decode_gregs[(((i) << 3) | (x)) & 15])
/* [dregs pregs (iregs mregs) (bregs lregs)]. */
static const enum machine_registers decode_regs[] =
@@ -361,7 +361,7 @@
REG_B0, REG_B1, REG_B2, REG_B3, REG_L0, REG_L1, REG_L2, REG_L3,
};
-#define regs(x, i) REGNAME (decode_regs[((i) << 3) | (x)])
+#define regs(x, i) REGNAME (decode_regs[(((i) << 3) | (x)) & 31])
/* [dregs pregs (iregs mregs) (bregs lregs) Low Half]. */
static const enum machine_registers decode_regs_lo[] =
@@ -372,7 +372,7 @@
REG_BL0, REG_BL1, REG_BL2, REG_BL3, REG_LL0, REG_LL1, REG_LL2, REG_LL3,
};
-#define regs_lo(x, i) REGNAME (decode_regs_lo[((i) << 3) | (x)])
+#define regs_lo(x, i) REGNAME (decode_regs_lo[(((i) << 3) | (x)) & 31])
/* [dregs pregs (iregs mregs) (bregs lregs) High Half]. */
static const enum machine_registers decode_regs_hi[] =
@@ -383,7 +383,7 @@
REG_BH0, REG_BH1, REG_BH2, REG_BH3, REG_LH0, REG_LH1, REG_LH2, REG_LH3,
};
-#define regs_hi(x, i) REGNAME (decode_regs_hi[((i) << 3) | (x)])
+#define regs_hi(x, i) REGNAME (decode_regs_hi[(((i) << 3) | (x)) & 31])
static const enum machine_registers decode_statbits[] =
{
Index: git/opcodes/ChangeLog
===================================================================
--- git.orig/opcodes/ChangeLog 2017-09-21 13:54:00.543230862 +0530
+++ git/opcodes/ChangeLog 2017-09-21 14:06:03.772928105 +0530
@@ -1,5 +1,13 @@
2017-06-15 Nick Clifton <nickc@redhat.com>
+ PR binutils/21586
+ * bfin-dis.c (gregs): Clip index to prevent overflow.
+ (regs): Likewise.
+ (regs_lo): Likewise.
+ (regs_hi): Likewise.
+
+2017-06-15 Nick Clifton <nickc@redhat.com>
+
PR binutils/21588
* rl78-decode.opc (OP_BUF_LEN): Define.
(GETBYTE): Check for the index exceeding OP_BUF_LEN.