aboutsummaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2023-03-15 13:06:23 +0000
committerNick Clifton <nickc@redhat.com>2023-03-15 13:06:23 +0000
commit71f646f2b3fc6e273fd17b5fdc9ba6bae242b330 (patch)
treed22b239000ec1f84e1f748eef8966fb0e92e3b94 /cpu
parent771860451862e89df453cd3b635a00d47d602533 (diff)
downloadgdb-71f646f2b3fc6e273fd17b5fdc9ba6bae242b330.zip
gdb-71f646f2b3fc6e273fd17b5fdc9ba6bae242b330.tar.gz
gdb-71f646f2b3fc6e273fd17b5fdc9ba6bae242b330.tar.bz2
Fix an illegal memory access when disassembling a corrupt MeP file.
PR 30231 * mep.opc (mep_print_insn): Check for an out of range index.
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ChangeLog5
-rw-r--r--cpu/mep.opc14
2 files changed, 19 insertions, 0 deletions
diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index bcb92e5..23c89c9 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-15 Nick Clifton <nickc@redhat.com>
+
+ PR 30231
+ * mep.opc (mep_print_insn): Check for an out of range index.
+
2022-12-31 Nick Clifton <nickc@redhat.com>
* 2.40 branch created.
diff --git a/cpu/mep.opc b/cpu/mep.opc
index 75ae830..6b264cc 100644
--- a/cpu/mep.opc
+++ b/cpu/mep.opc
@@ -1453,6 +1453,20 @@ mep_print_insn (CGEN_CPU_DESC cd, bfd_vma pc, disassemble_info *info)
mep_config_index = abfd->tdata.elf_obj_data->elf_header->e_flags & EF_MEP_INDEX_MASK;
/* This instantly redefines MEP_CONFIG, MEP_OMASK, .... MEP_VLIW64 */
+ /* mep_config_map is a variable sized array, so we do not know how big it is.
+ The only safe way to check the index therefore is to iterate over the array.
+ We do know that the last entry is all null. */
+ int i;
+ for (i = 0; i <= mep_config_index; i++)
+ if (mep_config_map[i].name == NULL)
+ break;
+
+ if (i < mep_config_index)
+ {
+ opcodes_error_handler (_("illegal MEP INDEX setting '%x' in ELF header e_flags field"), mep_config_index);
+ mep_config_index = 0;
+ }
+
cop_type = abfd->tdata.elf_obj_data->elf_header->e_flags & EF_MEP_COP_MASK;
if (cop_type == EF_MEP_COP_IVC2)
ivc2 = 1;