diff options
| author | Nick Clifton <nickc@redhat.com> | 2017-06-15 13:26:54 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2017-06-15 13:26:54 +0100 |
| commit | cd3ea7c69acc5045eb28f9bf80d923116e15e4f5 (patch) | |
| tree | 435204a1b2338e00a8acce0e30f49fee4455ec08 | |
| parent | 62b76e4b6e0b4cb5b3e0053d1de4097b32577049 (diff) | |
| download | binutils-gdb-cd3ea7c69acc5045eb28f9bf80d923116e15e4f5.tar.gz | |
Prevent address violation problem when disassembling corrupt aarch64 binary.
PR binutils/21595
* aarch64-dis.c (aarch64_ext_ldst_reglist): Check for an out of
range value.
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/aarch64-dis.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index c77f00a9792..e489d436750 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,11 @@ 2017-06-15 Nick Clifton <nickc@redhat.com> + PR binutils/21595 + * aarch64-dis.c (aarch64_ext_ldst_reglist): Check for an out of + range value. + +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. diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c index 27ef22bc09f..a860dbcb003 100644 --- a/opcodes/aarch64-dis.c +++ b/opcodes/aarch64-dis.c @@ -409,6 +409,9 @@ aarch64_ext_ldst_reglist (const aarch64_operand *self ATTRIBUTE_UNUSED, info->reglist.first_regno = extract_field (FLD_Rt, code, 0); /* opcode */ value = extract_field (FLD_opcode, code, 0); + /* PR 21595: Check for a bogus value. */ + if (value >= ARRAY_SIZE (data)) + return 0; if (expected_num != data[value].num_elements || data[value].is_reserved) return 0; info->reglist.num_regs = data[value].num_regs; |