diff options
| author | Nick Clifton <nickc@redhat.com> | 2023-03-15 11:44:56 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2023-03-15 11:44:56 +0000 |
| commit | 771860451862e89df453cd3b635a00d47d602533 (patch) | |
| tree | d593b119a5ae0364fe4883070ae20199850ae092 | |
| parent | 48c35a820d445350078583123c10a121cbfdaabd (diff) | |
| download | gdb-771860451862e89df453cd3b635a00d47d602533.zip gdb-771860451862e89df453cd3b635a00d47d602533.tar.gz gdb-771860451862e89df453cd3b635a00d47d602533.tar.bz2 | |
Fix an illegal memory access when disassebling a corrupt ARM file.
PR 30230
* arm-dis.c (get_sym_code_type): Check for non-ELF symbols.
| -rw-r--r-- | opcodes/ChangeLog | 5 | ||||
| -rw-r--r-- | opcodes/arm-dis.c | 17 |
2 files changed, 17 insertions, 5 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 9cf68d7..fb6612a 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2023-03-15 Nick Clifton <nickc@redhat.com> + + PR 30230 + * arm-dis.c (get_sym_code_type): Check for non-ELF symbols. + 2023-02-28 Richard Ball <richard.ball@arm.com> * aarch64-opc.c: Add MEC system registers. diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c index 65155ee..dffbad3 100644 --- a/opcodes/arm-dis.c +++ b/opcodes/arm-dis.c @@ -12400,13 +12400,14 @@ find_ifthen_state (bfd_vma pc, mapping symbol. */ static int -is_mapping_symbol (struct disassemble_info *info, int n, +is_mapping_symbol (struct disassemble_info *info, + int n, enum map_type *map_type) { - const char *name; + const char *name = bfd_asymbol_name (info->symtab[n]); - name = bfd_asymbol_name (info->symtab[n]); - if (name[0] == '$' && (name[1] == 'a' || name[1] == 't' || name[1] == 'd') + if (name[0] == '$' + && (name[1] == 'a' || name[1] == 't' || name[1] == 'd') && (name[2] == 0 || name[2] == '.')) { *map_type = ((name[1] == 'a') ? MAP_ARM @@ -12443,12 +12444,18 @@ get_sym_code_type (struct disassemble_info *info, { elf_symbol_type *es; unsigned int type; + asymbol * sym; /* If the symbol is in a different section, ignore it. */ if (info->section != NULL && info->section != info->symtab[n]->section) return false; - es = *(elf_symbol_type **)(info->symtab + n); + /* PR 30230: Reject non-ELF symbols, eg synthetic ones. */ + sym = info->symtab[n]; + if (bfd_asymbol_flavour (sym) != bfd_target_elf_flavour) + return false; + + es = (elf_symbol_type *) sym; type = ELF_ST_TYPE (es->internal_elf_sym.st_info); /* If the symbol has function type then use that. */ |