X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Freadelf.c;h=e8c215d847435c21d236595257e54123ea229d3f;hb=25499ac7ee92bca177c9436383ee167d6a220066;hp=0568a673eb82a893d0d2a67b17b1ef467264b3a7;hpb=fef1b0b33bc5c04ca1353fdb1d0e1b1966d616ad;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/readelf.c b/binutils/readelf.c index 0568a673eb..7ff29bc8ba 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -1,5 +1,5 @@ /* readelf.c -- display contents of an ELF format file - Copyright 1998-2013 Free Software Foundation, Inc. + Copyright (C) 1998-2017 Free Software Foundation, Inc. Originally developed by Eric Youngdale Modifications by Nick Clifton @@ -43,9 +43,7 @@ #include "sysdep.h" #include #include -#ifdef HAVE_ZLIB_H #include -#endif #ifdef HAVE_WCHAR_H #include #endif @@ -106,6 +104,7 @@ #include "elf/epiphany.h" #include "elf/fr30.h" #include "elf/frv.h" +#include "elf/ft32.h" #include "elf/h8.h" #include "elf/hppa.h" #include "elf/i386.h" @@ -125,17 +124,20 @@ #include "elf/metag.h" #include "elf/microblaze.h" #include "elf/mips.h" +#include "elf/riscv.h" #include "elf/mmix.h" #include "elf/mn10200.h" #include "elf/mn10300.h" #include "elf/moxie.h" #include "elf/mt.h" #include "elf/msp430.h" +#include "elf/nds32.h" #include "elf/nios2.h" -#include "elf/or32.h" +#include "elf/or1k.h" #include "elf/pj.h" #include "elf/ppc.h" #include "elf/ppc64.h" +#include "elf/pru.h" #include "elf/rl78.h" #include "elf/rx.h" #include "elf/s390.h" @@ -148,6 +150,8 @@ #include "elf/tilepro.h" #include "elf/v850.h" #include "elf/vax.h" +#include "elf/visium.h" +#include "elf/wasm32.h" #include "elf/x86-64.h" #include "elf/xc16x.h" #include "elf/xgate.h" @@ -163,12 +167,19 @@ #define offsetof(TYPE, MEMBER) ((size_t) &(((TYPE *) 0)->MEMBER)) #endif +typedef struct elf_section_list +{ + Elf_Internal_Shdr * hdr; + struct elf_section_list * next; +} elf_section_list; + char * program_name = "readelf"; -static long archive_file_offset; +static unsigned long archive_file_offset; static unsigned long archive_file_size; +static bfd_size_type current_file_size; static unsigned long dynamic_addr; static bfd_size_type dynamic_size; -static unsigned int dynamic_nent; +static size_t dynamic_nent; static char * dynamic_strings; static unsigned long dynamic_strings_length; static char * string_table; @@ -186,27 +197,28 @@ static Elf_Internal_Ehdr elf_header; static Elf_Internal_Shdr * section_headers; static Elf_Internal_Phdr * program_headers; static Elf_Internal_Dyn * dynamic_section; -static Elf_Internal_Shdr * symtab_shndx_hdr; -static int show_name; -static int do_dynamic; -static int do_syms; -static int do_dyn_syms; -static int do_reloc; -static int do_sections; -static int do_section_groups; -static int do_section_details; -static int do_segments; -static int do_unwind; -static int do_using_dynamic; -static int do_header; -static int do_dump; -static int do_version; -static int do_histogram; -static int do_debugging; -static int do_arch; -static int do_notes; -static int do_archive_index; -static int is_32bit_elf; +static elf_section_list * symtab_shndx_list; +static bfd_boolean show_name = FALSE; +static bfd_boolean do_dynamic = FALSE; +static bfd_boolean do_syms = FALSE; +static bfd_boolean do_dyn_syms = FALSE; +static bfd_boolean do_reloc = FALSE; +static bfd_boolean do_sections = FALSE; +static bfd_boolean do_section_groups = FALSE; +static bfd_boolean do_section_details = FALSE; +static bfd_boolean do_segments = FALSE; +static bfd_boolean do_unwind = FALSE; +static bfd_boolean do_using_dynamic = FALSE; +static bfd_boolean do_header = FALSE; +static bfd_boolean do_dump = FALSE; +static bfd_boolean do_version = FALSE; +static bfd_boolean do_histogram = FALSE; +static bfd_boolean do_debugging = FALSE; +static bfd_boolean do_arch = FALSE; +static bfd_boolean do_notes = FALSE; +static bfd_boolean do_archive_index = FALSE; +static bfd_boolean is_32bit_elf = FALSE; +static bfd_boolean decompress_dumps = FALSE; struct group_list { @@ -270,6 +282,18 @@ typedef enum print_mode } print_mode; +/* Versioned symbol info. */ +enum versioned_symbol_info +{ + symbol_undefined, + symbol_hidden, + symbol_public +}; + +static const char * get_symbol_version_string + (FILE *, bfd_boolean, const char *, unsigned long, unsigned, + Elf_Internal_Sym *, enum versioned_symbol_info *, unsigned short *); + #define UNKNOWN -1 #define SECTION_NAME(X) \ @@ -297,25 +321,65 @@ print_mode; } \ while (0) -/* Retrieve NMEMB structures, each SIZE bytes long from FILE starting at OFFSET. +/* Retrieve NMEMB structures, each SIZE bytes long from FILE starting at OFFSET + + the offset of the current archive member, if we are examining an archive. Put the retrieved data into VAR, if it is not NULL. Otherwise allocate a buffer using malloc and fill that. In either case return the pointer to the start of the retrieved data or NULL if something went wrong. If something does go wrong - emit an error message using REASON as part of the context. */ + and REASON is not NULL then emit an error message using REASON as part of the + context. */ static void * -get_data (void * var, FILE * file, long offset, size_t size, size_t nmemb, - const char * reason) +get_data (void * var, FILE * file, unsigned long offset, bfd_size_type size, + bfd_size_type nmemb, const char * reason) { void * mvar; + bfd_size_type amt = size * nmemb; if (size == 0 || nmemb == 0) return NULL; + /* If the size_t type is smaller than the bfd_size_type, eg because + you are building a 32-bit tool on a 64-bit host, then make sure + that when the sizes are cast to (size_t) no information is lost. */ + if (sizeof (size_t) < sizeof (bfd_size_type) + && ( (bfd_size_type) ((size_t) size) != size + || (bfd_size_type) ((size_t) nmemb) != nmemb)) + { + if (reason) + error (_("Size truncation prevents reading 0x%" BFD_VMA_FMT "x" + " elements of size 0x%" BFD_VMA_FMT "x for %s\n"), + nmemb, size, reason); + return NULL; + } + + /* Check for size overflow. */ + if (amt < nmemb) + { + if (reason) + error (_("Size overflow prevents reading 0x%" BFD_VMA_FMT "x" + " elements of size 0x%" BFD_VMA_FMT "x for %s\n"), + nmemb, size, reason); + return NULL; + } + + /* Be kind to memory chekers (eg valgrind, address sanitizer) by not + attempting to allocate memory when the read is bound to fail. */ + if (amt > current_file_size + || offset + archive_file_offset + amt > current_file_size) + { + if (reason) + error (_("Reading 0x%" BFD_VMA_FMT "x" + " bytes extends past end of file for %s\n"), + amt, reason); + return NULL; + } + if (fseek (file, archive_file_offset + offset, SEEK_SET)) { - error (_("Unable to seek to 0x%lx for %s\n"), - (unsigned long) archive_file_offset + offset, reason); + if (reason) + error (_("Unable to seek to 0x%lx for %s\n"), + archive_file_offset + offset, reason); return NULL; } @@ -323,24 +387,27 @@ get_data (void * var, FILE * file, long offset, size_t size, size_t nmemb, if (mvar == NULL) { /* Check for overflow. */ - if (nmemb < (~(size_t) 0 - 1) / size) + if (nmemb < (~(bfd_size_type) 0 - 1) / size) /* + 1 so that we can '\0' terminate invalid string table sections. */ - mvar = malloc (size * nmemb + 1); + mvar = malloc ((size_t) amt + 1); if (mvar == NULL) { - error (_("Out of memory allocating 0x%lx bytes for %s\n"), - (unsigned long)(size * nmemb), reason); + if (reason) + error (_("Out of memory allocating 0x%" BFD_VMA_FMT "x" + " bytes for %s\n"), + amt, reason); return NULL; } - ((char *) mvar)[size * nmemb] = '\0'; + ((char *) mvar)[amt] = '\0'; } - if (fread (mvar, size, nmemb, file) != nmemb) + if (fread (mvar, (size_t) size, (size_t) nmemb, file) != nmemb) { - error (_("Unable to read in 0x%lx bytes of %s\n"), - (unsigned long)(size * nmemb), reason); + if (reason) + error (_("Unable to read in 0x%" BFD_VMA_FMT "x bytes of %s\n"), + amt, reason); if (mvar != var) free (mvar); return NULL; @@ -349,19 +416,19 @@ get_data (void * var, FILE * file, long offset, size_t size, size_t nmemb, return mvar; } -/* Print a VMA value. */ +/* Print a VMA value in the MODE specified. + Returns the number of characters displayed. */ -static int +static unsigned int print_vma (bfd_vma vma, print_mode mode) { - int nc = 0; + unsigned int nc = 0; switch (mode) { case FULL_HEX: nc = printf ("0x"); - /* Drop through. */ - + /* Fall through. */ case LONG_HEX: #ifdef BFD64 if (is_32bit_elf) @@ -373,12 +440,10 @@ print_vma (bfd_vma vma, print_mode mode) case DEC_5: if (vma <= 99999) return printf ("%5" BFD_VMA_FMT "d", vma); - /* Drop through. */ - + /* Fall through. */ case PREFIX_HEX: nc = printf ("0x"); - /* Drop through. */ - + /* Fall through. */ case HEX: return nc + printf ("%" BFD_VMA_FMT "x", vma); @@ -387,8 +452,11 @@ print_vma (bfd_vma vma, print_mode mode) case UNSIGNED: return printf ("%" BFD_VMA_FMT "u", vma); + + default: + /* FIXME: Report unrecognised mode ? */ + return 0; } - return 0; } /* Display a symbol on stdout. Handles the display of control characters and @@ -402,21 +470,22 @@ print_vma (bfd_vma vma, print_mode mode) Returns the number of emitted characters. */ static unsigned int -print_symbol (int width, const char *symbol) +print_symbol (signed int width, const char *symbol) { bfd_boolean extra_padding = FALSE; - int num_printed = 0; + signed int num_printed = 0; #ifdef HAVE_MBSTATE_T mbstate_t state; #endif - int width_remaining; + unsigned int width_remaining; if (width < 0) { /* Keep the width positive. This also helps. */ width = - width; extra_padding = TRUE; - } + } + assert (width != 0); if (do_wide) /* Set the remaining width to a very large value. @@ -489,6 +558,66 @@ print_symbol (int width, const char *symbol) return num_printed; } +/* Returns a pointer to a static buffer containing a printable version of + the given section's name. Like print_symbol, except that it does not try + to print multibyte characters, it just interprets them as hex values. */ + +static const char * +printable_section_name (const Elf_Internal_Shdr * sec) +{ +#define MAX_PRINT_SEC_NAME_LEN 128 + static char sec_name_buf [MAX_PRINT_SEC_NAME_LEN + 1]; + const char * name = SECTION_NAME (sec); + char * buf = sec_name_buf; + char c; + unsigned int remaining = MAX_PRINT_SEC_NAME_LEN; + + while ((c = * name ++) != 0) + { + if (ISCNTRL (c)) + { + if (remaining < 2) + break; + + * buf ++ = '^'; + * buf ++ = c + 0x40; + remaining -= 2; + } + else if (ISPRINT (c)) + { + * buf ++ = c; + remaining -= 1; + } + else + { + static char hex[17] = "0123456789ABCDEF"; + + if (remaining < 4) + break; + * buf ++ = '<'; + * buf ++ = hex[(c & 0xf0) >> 4]; + * buf ++ = hex[c & 0x0f]; + * buf ++ = '>'; + remaining -= 4; + } + + if (remaining == 0) + break; + } + + * buf = 0; + return sec_name_buf; +} + +static const char * +printable_section_name_from_index (unsigned long ndx) +{ + if (ndx >= elf_header.e_shnum) + return _(""); + + return printable_section_name (section_headers + ndx); +} + /* Return a pointer to section NAME, or NULL if no such section exists. */ static Elf_Internal_Shdr * @@ -521,6 +650,21 @@ find_section_by_address (bfd_vma addr) return NULL; } +static Elf_Internal_Shdr * +find_section_by_type (unsigned int type) +{ + unsigned int i; + + for (i = 0; i < elf_header.e_shnum; i++) + { + Elf_Internal_Shdr *sec = section_headers + i; + if (sec->sh_type == type) + return sec; + } + + return NULL; +} + /* Return a pointer to section NAME, or NULL if no such section exists, restricted to the list of sections given in SET. */ @@ -532,29 +676,35 @@ find_section_in_set (const char * name, unsigned int * set) if (set != NULL) { while ((i = *set++) > 0) - if (streq (SECTION_NAME (section_headers + i), name)) - return section_headers + i; + { + /* See PR 21156 for a reproducer. */ + if (i >= elf_header.e_shnum) + continue; /* FIXME: Should we issue an error message ? */ + + if (streq (SECTION_NAME (section_headers + i), name)) + return section_headers + i; + } } return find_section (name); } -/* Read an unsigned LEB128 encoded value from p. Set *PLEN to the number of - bytes read. */ +/* Read an unsigned LEB128 encoded value from DATA. + Set *LENGTH_RETURN to the number of bytes read. */ static inline unsigned long -read_uleb128 (unsigned char *data, - unsigned int *length_return, +read_uleb128 (unsigned char * data, + unsigned int * length_return, const unsigned char * const end) { return read_leb128 (data, length_return, FALSE, end); } -/* Return true if the current file is for IA-64 machine and OpenVMS ABI. +/* Return TRUE if the current file is for IA-64 machine and OpenVMS ABI. This OS has so many departures from the ELF standard that we test it at many places. */ -static inline int +static inline bfd_boolean is_ia64_vms (void) { return elf_header.e_machine == EM_IA_64 @@ -563,14 +713,14 @@ is_ia64_vms (void) /* Guess the relocation size commonly used by the specific machines. */ -static int +static bfd_boolean guess_is_rela (unsigned int e_machine) { switch (e_machine) { /* Targets that use REL relocations. */ case EM_386: - case EM_486: + case EM_IAMCU: case EM_960: case EM_ARM: case EM_D10V: @@ -579,8 +729,6 @@ guess_is_rela (unsigned int e_machine) case EM_MIPS: case EM_MIPS_RS3_LE: case EM_CYGNUS_M32R: - case EM_OPENRISC: - case EM_OR32: case EM_SCORE: case EM_XGATE: return FALSE; @@ -592,6 +740,9 @@ guess_is_rela (unsigned int e_machine) case EM_ADAPTEVA_EPIPHANY: case EM_ALPHA: case EM_ALTERA_NIOS2: + case EM_ARC: + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: case EM_AVR: case EM_AVR_OLD: case EM_BLACKFIN: @@ -601,6 +752,7 @@ guess_is_rela (unsigned int e_machine) case EM_D30V: case EM_CYGNUS_D30V: case EM_FR30: + case EM_FT32: case EM_CYGNUS_FR30: case EM_CYGNUS_FRV: case EM_H8S: @@ -626,9 +778,13 @@ guess_is_rela (unsigned int e_machine) case EM_MSP430: case EM_MSP430_OLD: case EM_MT: + case EM_NDS32: case EM_NIOS32: + case EM_OR1K: case EM_PPC64: case EM_PPC: + case EM_TI_PRU: + case EM_RISCV: case EM_RL78: case EM_RX: case EM_S390: @@ -645,6 +801,7 @@ guess_is_rela (unsigned int e_machine) case EM_V850: case EM_CYGNUS_V850: case EM_VAX: + case EM_VISIUM: case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -653,6 +810,7 @@ guess_is_rela (unsigned int e_machine) case EM_XTENSA_OLD: case EM_MICROBLAZE: case EM_MICROBLAZE_OLD: + case EM_WEBASSEMBLY: return TRUE; case EM_68HC05: @@ -678,7 +836,13 @@ guess_is_rela (unsigned int e_machine) } } -static int +/* Load RELA type relocations from FILE at REL_OFFSET extending for REL_SIZE bytes. + Returns TRUE upon success, FALSE otherwise. If successful then a + pointer to a malloc'ed buffer containing the relocs is placed in *RELASP, + and the number of relocs loaded is placed in *NRELASP. It is the caller's + responsibility to free the allocated buffer. */ + +static bfd_boolean slurp_rela_relocs (FILE * file, unsigned long rel_offset, unsigned long rel_size, @@ -686,7 +850,7 @@ slurp_rela_relocs (FILE * file, unsigned long * nrelasp) { Elf_Internal_Rela * relas; - unsigned long nrelas; + size_t nrelas; unsigned int i; if (is_32bit_elf) @@ -696,7 +860,7 @@ slurp_rela_relocs (FILE * file, erelas = (Elf32_External_Rela *) get_data (NULL, file, rel_offset, 1, rel_size, _("32-bit relocation data")); if (!erelas) - return 0; + return FALSE; nrelas = rel_size / sizeof (Elf32_External_Rela); @@ -707,7 +871,7 @@ slurp_rela_relocs (FILE * file, { free (erelas); error (_("out of memory parsing relocs\n")); - return 0; + return FALSE; } for (i = 0; i < nrelas; i++) @@ -726,7 +890,7 @@ slurp_rela_relocs (FILE * file, erelas = (Elf64_External_Rela *) get_data (NULL, file, rel_offset, 1, rel_size, _("64-bit relocation data")); if (!erelas) - return 0; + return FALSE; nrelas = rel_size / sizeof (Elf64_External_Rela); @@ -737,7 +901,7 @@ slurp_rela_relocs (FILE * file, { free (erelas); error (_("out of memory parsing relocs\n")); - return 0; + return FALSE; } for (i = 0; i < nrelas; i++) @@ -771,12 +935,19 @@ slurp_rela_relocs (FILE * file, free (erelas); } + *relasp = relas; *nrelasp = nrelas; - return 1; + return TRUE; } -static int +/* Load REL type relocations from FILE at REL_OFFSET extending for REL_SIZE bytes. + Returns TRUE upon success, FALSE otherwise. If successful then a + pointer to a malloc'ed buffer containing the relocs is placed in *RELSP, + and the number of relocs loaded is placed in *NRELSP. It is the caller's + responsibility to free the allocated buffer. */ + +static bfd_boolean slurp_rel_relocs (FILE * file, unsigned long rel_offset, unsigned long rel_size, @@ -784,7 +955,7 @@ slurp_rel_relocs (FILE * file, unsigned long * nrelsp) { Elf_Internal_Rela * rels; - unsigned long nrels; + size_t nrels; unsigned int i; if (is_32bit_elf) @@ -794,7 +965,7 @@ slurp_rel_relocs (FILE * file, erels = (Elf32_External_Rel *) get_data (NULL, file, rel_offset, 1, rel_size, _("32-bit relocation data")); if (!erels) - return 0; + return FALSE; nrels = rel_size / sizeof (Elf32_External_Rel); @@ -804,7 +975,7 @@ slurp_rel_relocs (FILE * file, { free (erels); error (_("out of memory parsing relocs\n")); - return 0; + return FALSE; } for (i = 0; i < nrels; i++) @@ -823,7 +994,7 @@ slurp_rel_relocs (FILE * file, erels = (Elf64_External_Rel *) get_data (NULL, file, rel_offset, 1, rel_size, _("64-bit relocation data")); if (!erels) - return 0; + return FALSE; nrels = rel_size / sizeof (Elf64_External_Rel); @@ -833,7 +1004,7 @@ slurp_rel_relocs (FILE * file, { free (erels); error (_("out of memory parsing relocs\n")); - return 0; + return FALSE; } for (i = 0; i < nrels; i++) @@ -867,9 +1038,10 @@ slurp_rel_relocs (FILE * file, free (erels); } + *relsp = rels; *nrelsp = nrels; - return 1; + return TRUE; } /* Returns the reloc type extracted from the reloc info field. */ @@ -916,7 +1088,7 @@ uses_msp430x_relocs (void) /* Display the contents of the relocation data found at the specified offset. */ -static void +static bfd_boolean dump_relocations (FILE * file, unsigned long rel_offset, unsigned long rel_size, @@ -924,10 +1096,12 @@ dump_relocations (FILE * file, unsigned long nsyms, char * strtab, unsigned long strtablen, - int is_rela) + int is_rela, + bfd_boolean is_dynsym) { - unsigned int i; + unsigned long i; Elf_Internal_Rela * rels; + bfd_boolean res = TRUE; if (is_rela == UNKNOWN) is_rela = guess_is_rela (elf_header.e_machine); @@ -935,12 +1109,12 @@ dump_relocations (FILE * file, if (is_rela) { if (!slurp_rela_relocs (file, rel_offset, rel_size, &rels, &rel_size)) - return; + return FALSE; } else { if (!slurp_rel_relocs (file, rel_offset, rel_size, &rels, &rel_size)) - return; + return FALSE; } if (is_32bit_elf) @@ -1044,7 +1218,7 @@ dump_relocations (FILE * file, break; case EM_386: - case EM_486: + case EM_IAMCU: rtype = elf_i386_reloc_type (type); break; @@ -1122,6 +1296,10 @@ dump_relocations (FILE * file, rtype = elf_frv_reloc_type (type); break; + case EM_FT32: + rtype = elf_ft32_reloc_type (type); + break; + case EM_MCORE: rtype = elf_mcore_reloc_type (type); break; @@ -1140,10 +1318,15 @@ dump_relocations (FILE * file, rtype = elf_msp430x_reloc_type (type); break; } + /* Fall through. */ case EM_MSP430_OLD: rtype = elf_msp430_reloc_type (type); break; + case EM_NDS32: + rtype = elf_nds32_reloc_type (type); + break; + case EM_PPC: rtype = elf_ppc_reloc_type (type); break; @@ -1157,6 +1340,10 @@ dump_relocations (FILE * file, rtype = elf_mips_reloc_type (type); break; + case EM_RISCV: + rtype = elf_riscv_reloc_type (type); + break; + case EM_ALPHA: rtype = elf_alpha_reloc_type (type); break; @@ -1166,6 +1353,8 @@ dump_relocations (FILE * file, break; case EM_ARC: + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: rtype = elf_arc_reloc_type (type); break; @@ -1179,9 +1368,8 @@ dump_relocations (FILE * file, rtype = elf_h8_reloc_type (type); break; - case EM_OPENRISC: - case EM_OR32: - rtype = elf_or32_reloc_type (type); + case EM_OR1K: + rtype = elf_or1k_reloc_type (type); break; case EM_PJ: @@ -1231,6 +1419,10 @@ dump_relocations (FILE * file, rtype = elf_vax_reloc_type (type); break; + case EM_VISIUM: + rtype = elf_visium_reloc_type (type); + break; + case EM_ADAPTEVA_EPIPHANY: rtype = elf_epiphany_reloc_type (type); break; @@ -1308,6 +1500,10 @@ dump_relocations (FILE * file, rtype = elf_tilepro_reloc_type (type); break; + case EM_WEBASSEMBLY: + rtype = elf_wasm32_reloc_type (type); + break; + case EM_XGATE: rtype = elf_xgate_reloc_type (type); break; @@ -1315,6 +1511,10 @@ dump_relocations (FILE * file, case EM_ALTERA_NIOS2: rtype = elf_nios2_reloc_type (type); break; + + case EM_TI_PRU: + rtype = elf_pru_reloc_type (type); + break; } if (rtype == NULL) @@ -1338,6 +1538,7 @@ dump_relocations (FILE * file, case LITUSE_ALPHA_JSRDIRECT: rtype = "JSRDIRECT"; break; default: rtype = NULL; } + if (rtype) printf (" (%s)", rtype); else @@ -1345,18 +1546,33 @@ dump_relocations (FILE * file, putchar (' '); printf (_(""), (unsigned long) rels[i].r_addend); + res = FALSE; } } else if (symtab_index) { if (symtab == NULL || symtab_index >= nsyms) - printf (_(" bad symbol index: %08lx"), (unsigned long) symtab_index); + { + error (_(" bad symbol index: %08lx in reloc"), (unsigned long) symtab_index); + res = FALSE; + } else { Elf_Internal_Sym * psym; + const char * version_string; + enum versioned_symbol_info sym_info; + unsigned short vna_other; psym = symtab + symtab_index; + version_string + = get_symbol_version_string (file, is_dynsym, + strtab, strtablen, + symtab_index, + psym, + &sym_info, + &vna_other); + printf (" "); if (ELF_ST_TYPE (psym->st_info) == STT_GNU_IFUNC) @@ -1383,6 +1599,9 @@ dump_relocations (FILE * file, name = strtab + psym->st_name; len = print_symbol (width, name); + if (version_string) + printf (sym_info == symbol_public ? "@@%s" : "@%s", + version_string); printf ("()%-*s", len <= width ? (width + 1) - len : 1, " "); } else @@ -1400,8 +1619,7 @@ dump_relocations (FILE * file, if (ELF_ST_TYPE (psym->st_info) == STT_SECTION) { if (psym->st_shndx < elf_header.e_shnum) - sec_name - = SECTION_NAME (section_headers + psym->st_shndx); + sec_name = SECTION_NAME (section_headers + psym->st_shndx); else if (psym->st_shndx == SHN_ABS) sec_name = "ABS"; else if (psym->st_shndx == SHN_COMMON) @@ -1438,15 +1656,23 @@ dump_relocations (FILE * file, else if (strtab == NULL) printf (_(""), psym->st_name); else if (psym->st_name >= strtablen) - printf (_(""), psym->st_name); + { + error (_(""), psym->st_name); + res = FALSE; + } else - print_symbol (22, strtab + psym->st_name); + { + print_symbol (22, strtab + psym->st_name); + if (version_string) + printf (sym_info == symbol_public ? "@@%s" : "@%s", + version_string); + } if (is_rela) { - bfd_signed_vma off = rels[i].r_addend; + bfd_vma off = rels[i].r_addend; - if (off < 0) + if ((bfd_signed_vma) off < 0) printf (" - %" BFD_VMA_FMT "x", - off); else printf (" + %" BFD_VMA_FMT "x", off); @@ -1455,10 +1681,10 @@ dump_relocations (FILE * file, } else if (is_rela) { - bfd_signed_vma off = rels[i].r_addend; + bfd_vma off = rels[i].r_addend; printf ("%*c", is_32bit_elf ? 12 : 20, ' '); - if (off < 0) + if ((bfd_signed_vma) off < 0) printf ("-%" BFD_VMA_FMT "x", - off); else printf ("%" BFD_VMA_FMT "x", off); @@ -1501,6 +1727,8 @@ dump_relocations (FILE * file, } free (rels); + + return res; } static const char * @@ -1525,6 +1753,7 @@ get_mips_dynamic_type (unsigned long type) case DT_MIPS_GOTSYM: return "MIPS_GOTSYM"; case DT_MIPS_HIPAGENO: return "MIPS_HIPAGENO"; case DT_MIPS_RLD_MAP: return "MIPS_RLD_MAP"; + case DT_MIPS_RLD_MAP_REL: return "MIPS_RLD_MAP_REL"; case DT_MIPS_DELTA_CLASS: return "MIPS_DELTA_CLASS"; case DT_MIPS_DELTA_CLASS_NO: return "MIPS_DELTA_CLASS_NO"; case DT_MIPS_DELTA_INSTANCE: return "MIPS_DELTA_INSTANCE"; @@ -1575,7 +1804,7 @@ get_ppc_dynamic_type (unsigned long type) switch (type) { case DT_PPC_GOT: return "PPC_GOT"; - case DT_PPC_TLSOPT: return "PPC_TLSOPT"; + case DT_PPC_OPT: return "PPC_OPT"; default: return NULL; } @@ -1589,7 +1818,7 @@ get_ppc64_dynamic_type (unsigned long type) case DT_PPC64_GLINK: return "PPC64_GLINK"; case DT_PPC64_OPD: return "PPC64_OPD"; case DT_PPC64_OPDSZ: return "PPC64_OPDSZ"; - case DT_PPC64_TLSOPT: return "PPC64_TLSOPT"; + case DT_PPC64_OPT: return "PPC64_OPT"; default: return NULL; } @@ -1670,14 +1899,41 @@ get_ia64_dynamic_type (unsigned long type) } } +static const char * +get_solaris_section_type (unsigned long type) +{ + switch (type) + { + case 0x6fffffee: return "SUNW_ancillary"; + case 0x6fffffef: return "SUNW_capchain"; + case 0x6ffffff0: return "SUNW_capinfo"; + case 0x6ffffff1: return "SUNW_symsort"; + case 0x6ffffff2: return "SUNW_tlssort"; + case 0x6ffffff3: return "SUNW_LDYNSYM"; + case 0x6ffffff4: return "SUNW_dof"; + case 0x6ffffff5: return "SUNW_cap"; + case 0x6ffffff6: return "SUNW_SIGNATURE"; + case 0x6ffffff7: return "SUNW_ANNOTATE"; + case 0x6ffffff8: return "SUNW_DEBUGSTR"; + case 0x6ffffff9: return "SUNW_DEBUG"; + case 0x6ffffffa: return "SUNW_move"; + case 0x6ffffffb: return "SUNW_COMDAT"; + case 0x6ffffffc: return "SUNW_syminfo"; + case 0x6ffffffd: return "SUNW_verdef"; + case 0x6ffffffe: return "SUNW_verneed"; + case 0x6fffffff: return "SUNW_versym"; + case 0x70000000: return "SPARC_GOTDATA"; + default: return NULL; + } +} + static const char * get_alpha_dynamic_type (unsigned long type) { switch (type) { case DT_ALPHA_PLTRO: return "ALPHA_PLTRO"; - default: - return NULL; + default: return NULL; } } @@ -1692,8 +1948,7 @@ get_score_dynamic_type (unsigned long type) case DT_SCORE_GOTSYM: return "SCORE_GOTSYM"; case DT_SCORE_UNREFEXTNO: return "SCORE_UNREFEXTNO"; case DT_SCORE_HIPAGENO: return "SCORE_HIPAGENO"; - default: - return NULL; + default: return NULL; } } @@ -1708,8 +1963,7 @@ get_tic6x_dynamic_type (unsigned long type) case DT_C6000_DSBT_SIZE: return "C6000_DSBT_SIZE"; case DT_C6000_PREEMPTMAP: return "C6000_PREEMPTMAP"; case DT_C6000_DSBT_INDEX: return "C6000_DSBT_INDEX"; - default: - return NULL; + default: return NULL; } } @@ -1719,8 +1973,44 @@ get_nios2_dynamic_type (unsigned long type) switch (type) { case DT_NIOS2_GP: return "NIOS2_GP"; - default: - return NULL; + default: return NULL; + } +} + +static const char * +get_solaris_dynamic_type (unsigned long type) +{ + switch (type) + { + case 0x6000000d: return "SUNW_AUXILIARY"; + case 0x6000000e: return "SUNW_RTLDINF"; + case 0x6000000f: return "SUNW_FILTER"; + case 0x60000010: return "SUNW_CAP"; + case 0x60000011: return "SUNW_SYMTAB"; + case 0x60000012: return "SUNW_SYMSZ"; + case 0x60000013: return "SUNW_SORTENT"; + case 0x60000014: return "SUNW_SYMSORT"; + case 0x60000015: return "SUNW_SYMSORTSZ"; + case 0x60000016: return "SUNW_TLSSORT"; + case 0x60000017: return "SUNW_TLSSORTSZ"; + case 0x60000018: return "SUNW_CAPINFO"; + case 0x60000019: return "SUNW_STRPAD"; + case 0x6000001a: return "SUNW_CAPCHAIN"; + case 0x6000001b: return "SUNW_LDMACH"; + case 0x6000001d: return "SUNW_CAPCHAINENT"; + case 0x6000001f: return "SUNW_CAPCHAINSZ"; + case 0x60000021: return "SUNW_PARENT"; + case 0x60000023: return "SUNW_ASLR"; + case 0x60000025: return "SUNW_RELAX"; + case 0x60000029: return "SUNW_NXHEAP"; + case 0x6000002b: return "SUNW_NXSTACK"; + + case 0x70000001: return "SPARC_REGISTER"; + case 0x7ffffffd: return "AUXILIARY"; + case 0x7ffffffe: return "USED"; + case 0x7fffffff: return "FILTER"; + + default: return NULL; } } @@ -1765,6 +2055,7 @@ get_dynamic_type (unsigned long type) case DT_PREINIT_ARRAY: return "PREINIT_ARRAY"; case DT_PREINIT_ARRAYSZ: return "PREINIT_ARRAYSZ"; + case DT_SYMTAB_SHNDX: return "SYMTAB_SHNDX"; case DT_CHECKSUM: return "CHECKSUM"; case DT_PLTPADSZ: return "PLTPADSZ"; @@ -1842,7 +2133,10 @@ get_dynamic_type (unsigned long type) result = get_nios2_dynamic_type (type); break; default: - result = NULL; + if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + result = get_solaris_dynamic_type (type); + else + result = NULL; break; } @@ -1866,7 +2160,10 @@ get_dynamic_type (unsigned long type) result = get_ia64_dynamic_type (type); break; default: - result = NULL; + if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + result = get_solaris_dynamic_type (type); + else + result = NULL; break; } @@ -1890,11 +2187,11 @@ get_file_type (unsigned e_type) switch (e_type) { - case ET_NONE: return _("NONE (None)"); - case ET_REL: return _("REL (Relocatable file)"); - case ET_EXEC: return _("EXEC (Executable file)"); - case ET_DYN: return _("DYN (Shared object file)"); - case ET_CORE: return _("CORE (Core file)"); + case ET_NONE: return _("NONE (None)"); + case ET_REL: return _("REL (Relocatable file)"); + case ET_EXEC: return _("EXEC (Executable file)"); + case ET_DYN: return _("DYN (Shared object file)"); + case ET_CORE: return _("CORE (Core file)"); default: if ((e_type >= ET_LOPROC) && (e_type <= ET_HIPROC)) @@ -1914,29 +2211,37 @@ get_machine_name (unsigned e_machine) switch (e_machine) { + /* Please keep this switch table sorted by increasing EM_ value. */ + /* 0 */ case EM_NONE: return _("None"); - case EM_AARCH64: return "AArch64"; case EM_M32: return "WE32100"; case EM_SPARC: return "Sparc"; - case EM_SPU: return "SPU"; case EM_386: return "Intel 80386"; case EM_68K: return "MC68000"; case EM_88K: return "MC88000"; - case EM_486: return "Intel 80486"; + case EM_IAMCU: return "Intel MCU"; case EM_860: return "Intel 80860"; case EM_MIPS: return "MIPS R3000"; case EM_S370: return "IBM System/370"; + /* 10 */ case EM_MIPS_RS3_LE: return "MIPS R4000 big-endian"; case EM_OLD_SPARCV9: return "Sparc v9 (old)"; case EM_PARISC: return "HPPA"; - case EM_PPC_OLD: return "Power PC (old)"; + case EM_VPP550: return "Fujitsu VPP500"; case EM_SPARC32PLUS: return "Sparc v8+" ; case EM_960: return "Intel 90860"; case EM_PPC: return "PowerPC"; + /* 20 */ case EM_PPC64: return "PowerPC64"; + case EM_S390_OLD: + case EM_S390: return "IBM S/390"; + case EM_SPU: return "SPU"; + /* 30 */ + case EM_V800: return "Renesas V850 (using RH850 ABI)"; case EM_FR20: return "Fujitsu FR20"; case EM_RH32: return "TRW RH32"; case EM_MCORE: return "MCORE"; + /* 40 */ case EM_ARM: return "ARM"; case EM_OLD_ALPHA: return "Digital Alpha (old)"; case EM_SH: return "Renesas / SuperH SH"; @@ -1947,37 +2252,21 @@ get_machine_name (unsigned e_machine) case EM_H8_300H: return "Renesas H8/300H"; case EM_H8S: return "Renesas H8S"; case EM_H8_500: return "Renesas H8/500"; + /* 50 */ case EM_IA_64: return "Intel IA-64"; case EM_MIPS_X: return "Stanford MIPS-X"; case EM_COLDFIRE: return "Motorola Coldfire"; - case EM_ALPHA: return "Alpha"; - case EM_CYGNUS_D10V: - case EM_D10V: return "d10v"; - case EM_CYGNUS_D30V: - case EM_D30V: return "d30v"; - case EM_CYGNUS_M32R: - case EM_M32R: return "Renesas M32R (formerly Mitsubishi M32r)"; - case EM_CYGNUS_V850: - case EM_V800: return "Renesas V850 (using RH850 ABI)"; - case EM_V850: return "Renesas V850"; - case EM_CYGNUS_MN10300: - case EM_MN10300: return "mn10300"; - case EM_CYGNUS_MN10200: - case EM_MN10200: return "mn10200"; - case EM_MOXIE: return "Moxie"; - case EM_CYGNUS_FR30: - case EM_FR30: return "Fujitsu FR30"; - case EM_CYGNUS_FRV: return "Fujitsu FR-V"; - case EM_PJ_OLD: - case EM_PJ: return "picoJava"; + case EM_68HC12: return "Motorola MC68HC12 Microcontroller"; case EM_MMA: return "Fujitsu Multimedia Accelerator"; case EM_PCP: return "Siemens PCP"; case EM_NCPU: return "Sony nCPU embedded RISC processor"; case EM_NDR1: return "Denso NDR1 microprocesspr"; case EM_STARCORE: return "Motorola Star*Core processor"; case EM_ME16: return "Toyota ME16 processor"; + /* 60 */ case EM_ST100: return "STMicroelectronics ST100 processor"; case EM_TINYJ: return "Advanced Logic Corp. TinyJ embedded processor"; + case EM_X86_64: return "Advanced Micro Devices X86-64"; case EM_PDSP: return "Sony DSP processor"; case EM_PDP10: return "Digital Equipment Corp. PDP-10"; case EM_PDP11: return "Digital Equipment Corp. PDP-11"; @@ -1985,76 +2274,89 @@ get_machine_name (unsigned e_machine) case EM_ST9PLUS: return "STMicroelectronics ST9+ 8/16 bit microcontroller"; case EM_ST7: return "STMicroelectronics ST7 8-bit microcontroller"; case EM_68HC16: return "Motorola MC68HC16 Microcontroller"; - case EM_68HC12: return "Motorola MC68HC12 Microcontroller"; + /* 70 */ case EM_68HC11: return "Motorola MC68HC11 Microcontroller"; case EM_68HC08: return "Motorola MC68HC08 Microcontroller"; case EM_68HC05: return "Motorola MC68HC05 Microcontroller"; case EM_SVX: return "Silicon Graphics SVx"; case EM_ST19: return "STMicroelectronics ST19 8-bit microcontroller"; case EM_VAX: return "Digital VAX"; - case EM_AVR_OLD: - case EM_AVR: return "Atmel AVR 8-bit microcontroller"; case EM_CRIS: return "Axis Communications 32-bit embedded processor"; case EM_JAVELIN: return "Infineon Technologies 32-bit embedded cpu"; case EM_FIREPATH: return "Element 14 64-bit DSP processor"; case EM_ZSP: return "LSI Logic's 16-bit DSP processor"; + /* 80 */ case EM_MMIX: return "Donald Knuth's educational 64-bit processor"; case EM_HUANY: return "Harvard Universitys's machine-independent object format"; case EM_PRISM: return "Vitesse Prism"; - case EM_X86_64: return "Advanced Micro Devices X86-64"; - case EM_L1OM: return "Intel L1OM"; - case EM_K1OM: return "Intel K1OM"; - case EM_S390_OLD: - case EM_S390: return "IBM S/390"; - case EM_SCORE: return "SUNPLUS S+Core"; - case EM_XSTORMY16: return "Sanyo XStormy16 CPU core"; - case EM_OPENRISC: - case EM_OR32: return "OpenRISC"; - case EM_ARC_A5: return "ARC International ARCompact processor"; - case EM_CRX: return "National Semiconductor CRX microprocessor"; - case EM_ADAPTEVA_EPIPHANY: return "Adapteva EPIPHANY"; - case EM_DLX: return "OpenDLX"; - case EM_IP2K_OLD: - case EM_IP2K: return "Ubicom IP2xxx 8-bit microcontrollers"; - case EM_IQ2000: return "Vitesse IQ2000"; + case EM_AVR_OLD: + case EM_AVR: return "Atmel AVR 8-bit microcontroller"; + case EM_CYGNUS_FR30: + case EM_FR30: return "Fujitsu FR30"; + case EM_CYGNUS_D10V: + case EM_D10V: return "d10v"; + case EM_CYGNUS_D30V: + case EM_D30V: return "d30v"; + case EM_CYGNUS_V850: + case EM_V850: return "Renesas V850"; + case EM_CYGNUS_M32R: + case EM_M32R: return "Renesas M32R (formerly Mitsubishi M32r)"; + case EM_CYGNUS_MN10300: + case EM_MN10300: return "mn10300"; + /* 90 */ + case EM_CYGNUS_MN10200: + case EM_MN10200: return "mn10200"; + case EM_PJ: return "picoJava"; + case EM_OR1K: return "OpenRISC 1000"; + case EM_ARC_COMPACT: return "ARCompact"; case EM_XTENSA_OLD: case EM_XTENSA: return "Tensilica Xtensa Processor"; case EM_VIDEOCORE: return "Alphamosaic VideoCore processor"; case EM_TMM_GPP: return "Thompson Multimedia General Purpose Processor"; case EM_NS32K: return "National Semiconductor 32000 series"; case EM_TPC: return "Tenor Network TPC processor"; - case EM_ST200: return "STMicroelectronics ST200 microcontroller"; + case EM_SNP1K: return "Trebia SNP 1000 processor"; + /* 100 */ + case EM_ST200: return "STMicroelectronics ST200 microcontroller"; + case EM_IP2K_OLD: + case EM_IP2K: return "Ubicom IP2xxx 8-bit microcontrollers"; case EM_MAX: return "MAX Processor"; case EM_CR: return "National Semiconductor CompactRISC"; case EM_F2MC16: return "Fujitsu F2MC16"; case EM_MSP430: return "Texas Instruments msp430 microcontroller"; - case EM_LATTICEMICO32: return "Lattice Mico32"; - case EM_M32C_OLD: - case EM_M32C: return "Renesas M32c"; - case EM_MT: return "Morpho Techologies MT processor"; case EM_BLACKFIN: return "Analog Devices Blackfin"; case EM_SE_C33: return "S1C33 Family of Seiko Epson processors"; case EM_SEP: return "Sharp embedded microprocessor"; case EM_ARCA: return "Arca RISC microprocessor"; + /* 110 */ case EM_UNICORE: return "Unicore"; case EM_EXCESS: return "eXcess 16/32/64-bit configurable embedded CPU"; case EM_DXP: return "Icera Semiconductor Inc. Deep Execution Processor"; - case EM_NIOS32: return "Altera Nios"; case EM_ALTERA_NIOS2: return "Altera Nios II"; + case EM_CRX: return "National Semiconductor CRX microprocessor"; + case EM_XGATE: return "Motorola XGATE embedded processor"; case EM_C166: case EM_XC16X: return "Infineon Technologies xc16x"; case EM_M16C: return "Renesas M16C series microprocessors"; case EM_DSPIC30F: return "Microchip Technology dsPIC30F Digital Signal Controller"; case EM_CE: return "Freescale Communication Engine RISC core"; + /* 120 */ + case EM_M32C: return "Renesas M32c"; + /* 130 */ case EM_TSK3000: return "Altium TSK3000 core"; case EM_RS08: return "Freescale RS08 embedded processor"; case EM_ECOG2: return "Cyan Technology eCOG2 microprocessor"; + case EM_SCORE: return "SUNPLUS S+Core"; case EM_DSP24: return "New Japan Radio (NJR) 24-bit DSP Processor"; case EM_VIDEOCORE3: return "Broadcom VideoCore III processor"; + case EM_LATTICEMICO32: return "Lattice Mico32"; case EM_SE_C17: return "Seiko Epson C17 family"; + /* 140 */ case EM_TI_C6000: return "Texas Instruments TMS320C6000 DSP family"; case EM_TI_C2000: return "Texas Instruments TMS320C2000 DSP family"; case EM_TI_C5500: return "Texas Instruments TMS320C55x DSP family"; + case EM_TI_PRU: return "TI PRU I/O processor"; + /* 160 */ case EM_MMDSP_PLUS: return "STMicroelectronics 64bit VLIW Data Signal Processor"; case EM_CYPRESS_M8C: return "Cypress M8C microprocessor"; case EM_R32C: return "Renesas R32C series microprocessors"; @@ -2065,27 +2367,80 @@ get_machine_name (unsigned e_machine) case EM_NDS32: return "Andes Technology compact code size embedded RISC processor family"; case EM_ECOG1X: return "Cyan Technology eCOG1X family"; case EM_MAXQ30: return "Dallas Semiconductor MAXQ30 Core microcontrollers"; + /* 170 */ case EM_XIMO16: return "New Japan Radio (NJR) 16-bit DSP Processor"; case EM_MANIK: return "M2000 Reconfigurable RISC Microprocessor"; case EM_CRAYNV2: return "Cray Inc. NV2 vector architecture"; - case EM_CYGNUS_MEP: return "Toshiba MeP Media Engine"; - case EM_CR16: - case EM_MICROBLAZE: - case EM_MICROBLAZE_OLD: return "Xilinx MicroBlaze"; - case EM_RL78: return "Renesas RL78"; case EM_RX: return "Renesas RX"; case EM_METAG: return "Imagination Technologies Meta processor architecture"; case EM_MCST_ELBRUS: return "MCST Elbrus general purpose hardware architecture"; case EM_ECOG16: return "Cyan Technology eCOG16 family"; + case EM_CR16: + case EM_MICROBLAZE: + case EM_MICROBLAZE_OLD: return "Xilinx MicroBlaze"; case EM_ETPU: return "Freescale Extended Time Processing Unit"; case EM_SLE9X: return "Infineon Technologies SLE9X core"; - case EM_AVR32: return "Atmel Corporation 32-bit microprocessor family"; + /* 180 */ + case EM_L1OM: return "Intel L1OM"; + case EM_K1OM: return "Intel K1OM"; + case EM_INTEL182: return "Intel (reserved)"; + case EM_AARCH64: return "AArch64"; + case EM_ARM184: return "ARM (reserved)"; + case EM_AVR32: return "Atmel Corporation 32-bit microprocessor"; case EM_STM8: return "STMicroeletronics STM8 8-bit microcontroller"; case EM_TILE64: return "Tilera TILE64 multicore architecture family"; case EM_TILEPRO: return "Tilera TILEPro multicore architecture family"; - case EM_TILEGX: return "Tilera TILE-Gx multicore architecture family"; + /* 190 */ case EM_CUDA: return "NVIDIA CUDA architecture"; - case EM_XGATE: return "Motorola XGATE embedded processor"; + case EM_TILEGX: return "Tilera TILE-Gx multicore architecture family"; + case EM_CLOUDSHIELD: return "CloudShield architecture family"; + case EM_COREA_1ST: return "KIPO-KAIST Core-A 1st generation processor family"; + case EM_COREA_2ND: return "KIPO-KAIST Core-A 2nd generation processor family"; + case EM_ARC_COMPACT2: return "ARCv2"; + case EM_OPEN8: return "Open8 8-bit RISC soft processor core"; + case EM_RL78: return "Renesas RL78"; + case EM_VIDEOCORE5: return "Broadcom VideoCore V processor"; + case EM_78K0R: return "Renesas 78K0R"; + /* 200 */ + case EM_56800EX: return "Freescale 56800EX Digital Signal Controller (DSC)"; + case EM_BA1: return "Beyond BA1 CPU architecture"; + case EM_BA2: return "Beyond BA2 CPU architecture"; + case EM_XCORE: return "XMOS xCORE processor family"; + case EM_MCHP_PIC: return "Microchip 8-bit PIC(r) family"; + /* 210 */ + case EM_KM32: return "KM211 KM32 32-bit processor"; + case EM_KMX32: return "KM211 KMX32 32-bit processor"; + case EM_KMX16: return "KM211 KMX16 16-bit processor"; + case EM_KMX8: return "KM211 KMX8 8-bit processor"; + case EM_KVARC: return "KM211 KVARC processor"; + case EM_CDP: return "Paneve CDP architecture family"; + case EM_COGE: return "Cognitive Smart Memory Processor"; + case EM_COOL: return "Bluechip Systems CoolEngine"; + case EM_NORC: return "Nanoradio Optimized RISC"; + case EM_CSR_KALIMBA: return "CSR Kalimba architecture family"; + /* 220 */ + case EM_Z80: return "Zilog Z80"; + case EM_VISIUM: return "CDS VISIUMcore processor"; + case EM_FT32: return "FTDI Chip FT32"; + case EM_MOXIE: return "Moxie"; + case EM_AMDGPU: return "AMD GPU"; + case EM_RISCV: return "RISC-V"; + case EM_LANAI: return "Lanai 32-bit processor"; + case EM_BPF: return "Linux BPF"; + + /* Large numbers... */ + case EM_MT: return "Morpho Techologies MT processor"; + case EM_ALPHA: return "Alpha"; + case EM_WEBASSEMBLY: return "Web Assembly"; + case EM_DLX: return "OpenDLX"; + case EM_XSTORMY16: return "Sanyo XStormy16 CPU core"; + case EM_IQ2000: return "Vitesse IQ2000"; + case EM_M32C_OLD: + case EM_NIOS32: return "Altera Nios"; + case EM_CYGNUS_MEP: return "Toshiba MeP Media Engine"; + case EM_ADAPTEVA_EPIPHANY: return "Adapteva EPIPHANY"; + case EM_CYGNUS_FRV: return "Fujitsu FR-V"; + default: snprintf (buff, sizeof (buff), _(": 0x%x"), e_machine); return buff; @@ -2093,34 +2448,98 @@ get_machine_name (unsigned e_machine) } static void -decode_ARM_machine_flags (unsigned e_flags, char buf[]) +decode_ARC_machine_flags (unsigned e_flags, unsigned e_machine, char buf[]) { - unsigned eabi; - int unknown = 0; + /* ARC has two machine types EM_ARC_COMPACT and EM_ARC_COMPACT2. Some + other compilers don't a specific architecture type in the e_flags, and + instead use EM_ARC_COMPACT for old ARC600, ARC601, and ARC700 + architectures, and switch to EM_ARC_COMPACT2 for newer ARCEM and ARCHS + architectures. - eabi = EF_ARM_EABI_VERSION (e_flags); - e_flags &= ~ EF_ARM_EABIMASK; + Th GNU tools follows this use of EM_ARC_COMPACT and EM_ARC_COMPACT2, + but also sets a specific architecture type in the e_flags field. - /* Handle "generic" ARM flags. */ - if (e_flags & EF_ARM_RELEXEC) - { - strcat (buf, ", relocatable executable"); - e_flags &= ~ EF_ARM_RELEXEC; - } + However, when decoding the flags we don't worry if we see an + unexpected pairing, for example EM_ARC_COMPACT machine type, with + ARCEM architecture type. */ - if (e_flags & EF_ARM_HASENTRY) + switch (e_flags & EF_ARC_MACH_MSK) { - strcat (buf, ", has entry point"); - e_flags &= ~ EF_ARM_HASENTRY; - } + /* We only expect these to occur for EM_ARC_COMPACT2. */ + case EF_ARC_CPU_ARCV2EM: + strcat (buf, ", ARC EM"); + break; + case EF_ARC_CPU_ARCV2HS: + strcat (buf, ", ARC HS"); + break; - /* Now handle EABI specific flags. */ - switch (eabi) - { + /* We only expect these to occur for EM_ARC_COMPACT. */ + case E_ARC_MACH_ARC600: + strcat (buf, ", ARC600"); + break; + case E_ARC_MACH_ARC601: + strcat (buf, ", ARC601"); + break; + case E_ARC_MACH_ARC700: + strcat (buf, ", ARC700"); + break; + + /* The only times we should end up here are (a) A corrupt ELF, (b) A + new ELF with new architecture being read by an old version of + readelf, or (c) An ELF built with non-GNU compiler that does not + set the architecture in the e_flags. */ + default: + if (e_machine == EM_ARC_COMPACT) + strcat (buf, ", Unknown ARCompact"); + else + strcat (buf, ", Unknown ARC"); + break; + } + + switch (e_flags & EF_ARC_OSABI_MSK) + { + case E_ARC_OSABI_ORIG: + strcat (buf, ", (ABI:legacy)"); + break; + case E_ARC_OSABI_V2: + strcat (buf, ", (ABI:v2)"); + break; + /* Only upstream 3.9+ kernels will support ARCv2 ISA. */ + case E_ARC_OSABI_V3: + strcat (buf, ", v3 no-legacy-syscalls ABI"); + break; + case E_ARC_OSABI_V4: + strcat (buf, ", v4 ABI"); + break; + default: + strcat (buf, ", unrecognised ARC OSABI flag"); + break; + } +} + +static void +decode_ARM_machine_flags (unsigned e_flags, char buf[]) +{ + unsigned eabi; + bfd_boolean unknown = FALSE; + + eabi = EF_ARM_EABI_VERSION (e_flags); + e_flags &= ~ EF_ARM_EABIMASK; + + /* Handle "generic" ARM flags. */ + if (e_flags & EF_ARM_RELEXEC) + { + strcat (buf, ", relocatable executable"); + e_flags &= ~ EF_ARM_RELEXEC; + } + + /* Now handle EABI specific flags. */ + switch (eabi) + { default: strcat (buf, ", "); if (e_flags) - unknown = 1; + unknown = TRUE; break; case EF_ARM_EABI_VER1: @@ -2140,7 +2559,7 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } } @@ -2171,7 +2590,7 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } } @@ -2202,10 +2621,9 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } - break; } break; @@ -2238,7 +2656,7 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } } @@ -2297,7 +2715,7 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } } @@ -2307,6 +2725,280 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) strcat (buf,_(", ")); } +static void +decode_AVR_machine_flags (unsigned e_flags, char buf[], size_t size) +{ + --size; /* Leave space for null terminator. */ + + switch (e_flags & EF_AVR_MACH) + { + case E_AVR_MACH_AVR1: + strncat (buf, ", avr:1", size); + break; + case E_AVR_MACH_AVR2: + strncat (buf, ", avr:2", size); + break; + case E_AVR_MACH_AVR25: + strncat (buf, ", avr:25", size); + break; + case E_AVR_MACH_AVR3: + strncat (buf, ", avr:3", size); + break; + case E_AVR_MACH_AVR31: + strncat (buf, ", avr:31", size); + break; + case E_AVR_MACH_AVR35: + strncat (buf, ", avr:35", size); + break; + case E_AVR_MACH_AVR4: + strncat (buf, ", avr:4", size); + break; + case E_AVR_MACH_AVR5: + strncat (buf, ", avr:5", size); + break; + case E_AVR_MACH_AVR51: + strncat (buf, ", avr:51", size); + break; + case E_AVR_MACH_AVR6: + strncat (buf, ", avr:6", size); + break; + case E_AVR_MACH_AVRTINY: + strncat (buf, ", avr:100", size); + break; + case E_AVR_MACH_XMEGA1: + strncat (buf, ", avr:101", size); + break; + case E_AVR_MACH_XMEGA2: + strncat (buf, ", avr:102", size); + break; + case E_AVR_MACH_XMEGA3: + strncat (buf, ", avr:103", size); + break; + case E_AVR_MACH_XMEGA4: + strncat (buf, ", avr:104", size); + break; + case E_AVR_MACH_XMEGA5: + strncat (buf, ", avr:105", size); + break; + case E_AVR_MACH_XMEGA6: + strncat (buf, ", avr:106", size); + break; + case E_AVR_MACH_XMEGA7: + strncat (buf, ", avr:107", size); + break; + default: + strncat (buf, ", avr:", size); + break; + } + + size -= strlen (buf); + if (e_flags & EF_AVR_LINKRELAX_PREPARED) + strncat (buf, ", link-relax", size); +} + +static void +decode_NDS32_machine_flags (unsigned e_flags, char buf[], size_t size) +{ + unsigned abi; + unsigned arch; + unsigned config; + unsigned version; + bfd_boolean has_fpu = FALSE; + unsigned int r = 0; + + static const char *ABI_STRINGS[] = + { + "ABI v0", /* use r5 as return register; only used in N1213HC */ + "ABI v1", /* use r0 as return register */ + "ABI v2", /* use r0 as return register and don't reserve 24 bytes for arguments */ + "ABI v2fp", /* for FPU */ + "AABI", + "ABI2 FP+" + }; + static const char *VER_STRINGS[] = + { + "Andes ELF V1.3 or older", + "Andes ELF V1.3.1", + "Andes ELF V1.4" + }; + static const char *ARCH_STRINGS[] = + { + "", + "Andes Star v1.0", + "Andes Star v2.0", + "Andes Star v3.0", + "Andes Star v3.0m" + }; + + abi = EF_NDS_ABI & e_flags; + arch = EF_NDS_ARCH & e_flags; + config = EF_NDS_INST & e_flags; + version = EF_NDS32_ELF_VERSION & e_flags; + + memset (buf, 0, size); + + switch (abi) + { + case E_NDS_ABI_V0: + case E_NDS_ABI_V1: + case E_NDS_ABI_V2: + case E_NDS_ABI_V2FP: + case E_NDS_ABI_AABI: + case E_NDS_ABI_V2FP_PLUS: + /* In case there are holes in the array. */ + r += snprintf (buf + r, size - r, ", %s", ABI_STRINGS[abi >> EF_NDS_ABI_SHIFT]); + break; + + default: + r += snprintf (buf + r, size - r, ", "); + break; + } + + switch (version) + { + case E_NDS32_ELF_VER_1_2: + case E_NDS32_ELF_VER_1_3: + case E_NDS32_ELF_VER_1_4: + r += snprintf (buf + r, size - r, ", %s", VER_STRINGS[version >> EF_NDS32_ELF_VERSION_SHIFT]); + break; + + default: + r += snprintf (buf + r, size - r, ", "); + break; + } + + if (E_NDS_ABI_V0 == abi) + { + /* OLD ABI; only used in N1213HC, has performance extension 1. */ + r += snprintf (buf + r, size - r, ", Andes Star v1.0, N1213HC, MAC, PERF1"); + if (arch == E_NDS_ARCH_STAR_V1_0) + r += snprintf (buf + r, size -r, ", 16b"); /* has 16-bit instructions */ + return; + } + + switch (arch) + { + case E_NDS_ARCH_STAR_V1_0: + case E_NDS_ARCH_STAR_V2_0: + case E_NDS_ARCH_STAR_V3_0: + case E_NDS_ARCH_STAR_V3_M: + r += snprintf (buf + r, size - r, ", %s", ARCH_STRINGS[arch >> EF_NDS_ARCH_SHIFT]); + break; + + default: + r += snprintf (buf + r, size - r, ", "); + /* ARCH version determines how the e_flags are interpreted. + If it is unknown, we cannot proceed. */ + return; + } + + /* Newer ABI; Now handle architecture specific flags. */ + if (arch == E_NDS_ARCH_STAR_V1_0) + { + if (config & E_NDS32_HAS_MFUSR_PC_INST) + r += snprintf (buf + r, size -r, ", MFUSR_PC"); + + if (!(config & E_NDS32_HAS_NO_MAC_INST)) + r += snprintf (buf + r, size -r, ", MAC"); + + if (config & E_NDS32_HAS_DIV_INST) + r += snprintf (buf + r, size -r, ", DIV"); + + if (config & E_NDS32_HAS_16BIT_INST) + r += snprintf (buf + r, size -r, ", 16b"); + } + else + { + if (config & E_NDS32_HAS_MFUSR_PC_INST) + { + if (version <= E_NDS32_ELF_VER_1_3) + r += snprintf (buf + r, size -r, ", [B8]"); + else + r += snprintf (buf + r, size -r, ", EX9"); + } + + if (config & E_NDS32_HAS_MAC_DX_INST) + r += snprintf (buf + r, size -r, ", MAC_DX"); + + if (config & E_NDS32_HAS_DIV_DX_INST) + r += snprintf (buf + r, size -r, ", DIV_DX"); + + if (config & E_NDS32_HAS_16BIT_INST) + { + if (version <= E_NDS32_ELF_VER_1_3) + r += snprintf (buf + r, size -r, ", 16b"); + else + r += snprintf (buf + r, size -r, ", IFC"); + } + } + + if (config & E_NDS32_HAS_EXT_INST) + r += snprintf (buf + r, size -r, ", PERF1"); + + if (config & E_NDS32_HAS_EXT2_INST) + r += snprintf (buf + r, size -r, ", PERF2"); + + if (config & E_NDS32_HAS_FPU_INST) + { + has_fpu = TRUE; + r += snprintf (buf + r, size -r, ", FPU_SP"); + } + + if (config & E_NDS32_HAS_FPU_DP_INST) + { + has_fpu = TRUE; + r += snprintf (buf + r, size -r, ", FPU_DP"); + } + + if (config & E_NDS32_HAS_FPU_MAC_INST) + { + has_fpu = TRUE; + r += snprintf (buf + r, size -r, ", FPU_MAC"); + } + + if (has_fpu) + { + switch ((config & E_NDS32_FPU_REG_CONF) >> E_NDS32_FPU_REG_CONF_SHIFT) + { + case E_NDS32_FPU_REG_8SP_4DP: + r += snprintf (buf + r, size -r, ", FPU_REG:8/4"); + break; + case E_NDS32_FPU_REG_16SP_8DP: + r += snprintf (buf + r, size -r, ", FPU_REG:16/8"); + break; + case E_NDS32_FPU_REG_32SP_16DP: + r += snprintf (buf + r, size -r, ", FPU_REG:32/16"); + break; + case E_NDS32_FPU_REG_32SP_32DP: + r += snprintf (buf + r, size -r, ", FPU_REG:32/32"); + break; + } + } + + if (config & E_NDS32_HAS_AUDIO_INST) + r += snprintf (buf + r, size -r, ", AUDIO"); + + if (config & E_NDS32_HAS_STRING_INST) + r += snprintf (buf + r, size -r, ", STR"); + + if (config & E_NDS32_HAS_REDUCED_REGS) + r += snprintf (buf + r, size -r, ", 16REG"); + + if (config & E_NDS32_HAS_VIDEO_INST) + { + if (version <= E_NDS32_ELF_VER_1_3) + r += snprintf (buf + r, size -r, ", VIDEO"); + else + r += snprintf (buf + r, size -r, ", SATURATION"); + } + + if (config & E_NDS32_HAS_ENCRIPT_INST) + r += snprintf (buf + r, size -r, ", ENCRP"); + + if (config & E_NDS32_HAS_L2C_INST) + r += snprintf (buf + r, size -r, ", L2C"); +} + static char * get_machine_flags (unsigned e_flags, unsigned e_machine) { @@ -2321,10 +3013,19 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) default: break; + case EM_ARC_COMPACT2: + case EM_ARC_COMPACT: + decode_ARC_machine_flags (e_flags, e_machine, buf); + break; + case EM_ARM: decode_ARM_machine_flags (e_flags, buf); break; + case EM_AVR: + decode_AVR_machine_flags (e_flags, buf, sizeof buf); + break; + case EM_BLACKFIN: if (e_flags & EF_BFIN_PIC) strcat (buf, ", PIC"); @@ -2450,6 +3151,40 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) } break; + case EM_CYGNUS_MEP: + switch (e_flags & EF_MEP_CPU_MASK) + { + case EF_MEP_CPU_MEP: strcat (buf, ", generic MeP"); break; + case EF_MEP_CPU_C2: strcat (buf, ", MeP C2"); break; + case EF_MEP_CPU_C3: strcat (buf, ", MeP C3"); break; + case EF_MEP_CPU_C4: strcat (buf, ", MeP C4"); break; + case EF_MEP_CPU_C5: strcat (buf, ", MeP C5"); break; + case EF_MEP_CPU_H1: strcat (buf, ", MeP H1"); break; + default: strcat (buf, _(", ")); break; + } + + switch (e_flags & EF_MEP_COP_MASK) + { + case EF_MEP_COP_NONE: break; + case EF_MEP_COP_AVC: strcat (buf, ", AVC coprocessor"); break; + case EF_MEP_COP_AVC2: strcat (buf, ", AVC2 coprocessor"); break; + case EF_MEP_COP_FMAX: strcat (buf, ", FMAX coprocessor"); break; + case EF_MEP_COP_IVC2: strcat (buf, ", IVC2 coprocessor"); break; + default: strcat (buf, _("")); break; + } + + if (e_flags & EF_MEP_LIBRARY) + strcat (buf, ", Built for Library"); + + if (e_flags & EF_MEP_INDEX_MASK) + sprintf (buf + strlen (buf), ", Configuration Index: %#x", + e_flags & EF_MEP_INDEX_MASK); + + if (e_flags & ~ EF_MEP_ALL_FLAGS) + sprintf (buf + strlen (buf), _(", unknown flags bits: %#x"), + e_flags & ~ EF_MEP_ALL_FLAGS); + break; + case EM_PPC: if (e_flags & EF_PPC_EMB) strcat (buf, ", emb"); @@ -2461,10 +3196,20 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) strcat (buf, _(", relocatable-lib")); break; + case EM_PPC64: + if (e_flags & EF_PPC64_ABI) + { + char abi[] = ", abiv0"; + + abi[6] += e_flags & EF_PPC64_ABI; + strcat (buf, abi); + } + break; + case EM_V800: if ((e_flags & EF_RH850_ABI) == EF_RH850_ABI) strcat (buf, ", RH850 ABI"); - + if (e_flags & EF_V800_850E3) strcat (buf, ", V3 architecture"); @@ -2492,12 +3237,8 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) { case EF_RH850_FPU_DOUBLE: strcat (buf, ", double precision FPU"); break; case EF_RH850_FPU_SINGLE: strcat (buf, ", single precision FPU"); break; - case EF_RH850_SIMD: strcat (buf, ", SIMD"); break; - case EF_RH850_CACHE: strcat (buf, ", CACHE"); break; - case EF_RH850_MMU: strcat (buf, ", MMU"); break; case EF_RH850_REGMODE22: strcat (buf, ", regmode:22"); break; case EF_RH850_REGMODE32: strcat (buf, ", regmode:23"); break; - case EF_RH850_DATA_ALIGN8: strcat (buf, ", 8-byte alignment"); break; case EF_RH850_GP_FIX: strcat (buf, ", r4 fixed"); break; case EF_RH850_GP_NOFIX: strcat (buf, ", r4 free"); break; case EF_RH850_EP_FIX: strcat (buf, ", r30 fixed"); break; @@ -2591,6 +3332,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_LS3A: strcat (buf, ", loongson-3a"); break; case E_MIPS_MACH_OCTEON: strcat (buf, ", octeon"); break; case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break; + case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; case 0: /* We simply ignore the field in this case to avoid confusion: @@ -2633,12 +3375,42 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) case E_MIPS_ARCH_5: strcat (buf, ", mips5"); break; case E_MIPS_ARCH_32: strcat (buf, ", mips32"); break; case E_MIPS_ARCH_32R2: strcat (buf, ", mips32r2"); break; + case E_MIPS_ARCH_32R6: strcat (buf, ", mips32r6"); break; case E_MIPS_ARCH_64: strcat (buf, ", mips64"); break; case E_MIPS_ARCH_64R2: strcat (buf, ", mips64r2"); break; + case E_MIPS_ARCH_64R6: strcat (buf, ", mips64r6"); break; default: strcat (buf, _(", unknown ISA")); break; } break; + case EM_NDS32: + decode_NDS32_machine_flags (e_flags, buf, sizeof buf); + break; + + case EM_RISCV: + if (e_flags & EF_RISCV_RVC) + strcat (buf, ", RVC"); + + switch (e_flags & EF_RISCV_FLOAT_ABI) + { + case EF_RISCV_FLOAT_ABI_SOFT: + strcat (buf, ", soft-float ABI"); + break; + + case EF_RISCV_FLOAT_ABI_SINGLE: + strcat (buf, ", single-float ABI"); + break; + + case EF_RISCV_FLOAT_ABI_DOUBLE: + strcat (buf, ", double-float ABI"); + break; + + case EF_RISCV_FLOAT_ABI_QUAD: + strcat (buf, ", quad-float ABI"); + break; + } + break; + case EM_SH: switch ((e_flags & EF_SH_MACH_MASK)) { @@ -2673,6 +3445,11 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) strcat (buf, ", fdpic"); break; + case EM_OR1K: + if (e_flags & EF_OR1K_NODELAY) + strcat (buf, ", no delay"); + break; + case EM_SPARCV9: if (e_flags & EF_SPARC_32PLUS) strcat (buf, ", v8+"); @@ -2768,7 +3545,9 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) strcat (buf, ", abort"); break; default: - abort (); + warn (_("Unrecognised IA64 VMS Command Code: %x\n"), + e_flags & EF_IA_64_VMS_COMCOD); + strcat (buf, ", "); } } break; @@ -2782,20 +3561,41 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) strcat (buf, ", G-Float"); break; + case EM_VISIUM: + if (e_flags & EF_VISIUM_ARCH_MCM) + strcat (buf, ", mcm"); + else if (e_flags & EF_VISIUM_ARCH_MCM24) + strcat (buf, ", mcm24"); + if (e_flags & EF_VISIUM_ARCH_GR6) + strcat (buf, ", gr6"); + break; + case EM_RL78: - if (e_flags & E_FLAG_RL78_G10) - strcat (buf, ", G10"); + switch (e_flags & E_FLAG_RL78_CPU_MASK) + { + case E_FLAG_RL78_ANY_CPU: break; + case E_FLAG_RL78_G10: strcat (buf, ", G10"); break; + case E_FLAG_RL78_G13: strcat (buf, ", G13"); break; + case E_FLAG_RL78_G14: strcat (buf, ", G14"); break; + } + if (e_flags & E_FLAG_RL78_64BIT_DOUBLES) + strcat (buf, ", 64-bit doubles"); break; - + case EM_RX: if (e_flags & E_FLAG_RX_64BIT_DOUBLES) strcat (buf, ", 64-bit doubles"); if (e_flags & E_FLAG_RX_DSP) strcat (buf, ", dsp"); if (e_flags & E_FLAG_RX_PID) - strcat (buf, ", pid"); + strcat (buf, ", pid"); if (e_flags & E_FLAG_RX_ABI) strcat (buf, ", RX ABI"); + if (e_flags & E_FLAG_RX_SINSNS_SET) + strcat (buf, e_flags & E_FLAG_RX_SINSNS_YES + ? ", uses String instructions" : ", bans String instructions"); + if (e_flags & E_FLAG_RX_V2) + strcat (buf, ", V2"); break; case EM_S390: @@ -2861,6 +3661,8 @@ get_osabi_name (unsigned int osabi) case ELFOSABI_NSK: return "HP - Non-Stop Kernel"; case ELFOSABI_AROS: return "AROS"; case ELFOSABI_FENIXOS: return "FenixOS"; + case ELFOSABI_CLOUDABI: return "Nuxi CloudABI"; + case ELFOSABI_OPENVOS: return "Stratus Technologies OpenVOS"; default: if (osabi >= 64) switch (elf_header.e_machine) @@ -2876,6 +3678,7 @@ get_osabi_name (unsigned int osabi) case EM_MSP430: case EM_MSP430_OLD: + case EM_VISIUM: switch (osabi) { case ELFOSABI_STANDALONE: return _("Standalone App"); @@ -2907,13 +3710,9 @@ get_aarch64_segment_type (unsigned long type) { switch (type) { - case PT_AARCH64_ARCHEXT: - return "AARCH64_ARCHEXT"; - default: - break; + case PT_AARCH64_ARCHEXT: return "AARCH64_ARCHEXT"; + default: return NULL; } - - return NULL; } static const char * @@ -2921,13 +3720,9 @@ get_arm_segment_type (unsigned long type) { switch (type) { - case PT_ARM_EXIDX: - return "EXIDX"; - default: - break; + case PT_ARM_EXIDX: return "EXIDX"; + default: return NULL; } - - return NULL; } static const char * @@ -2935,17 +3730,12 @@ get_mips_segment_type (unsigned long type) { switch (type) { - case PT_MIPS_REGINFO: - return "REGINFO"; - case PT_MIPS_RTPROC: - return "RTPROC"; - case PT_MIPS_OPTIONS: - return "OPTIONS"; - default: - break; + case PT_MIPS_REGINFO: return "REGINFO"; + case PT_MIPS_RTPROC: return "RTPROC"; + case PT_MIPS_OPTIONS: return "OPTIONS"; + case PT_MIPS_ABIFLAGS: return "ABIFLAGS"; + default: return NULL; } - - return NULL; } static const char * @@ -2972,11 +3762,8 @@ get_parisc_segment_type (unsigned long type) case PT_PARISC_ARCHEXT: return "PARISC_ARCHEXT"; case PT_PARISC_UNWIND: return "PARISC_UNWIND"; case PT_PARISC_WEAKORDER: return "PARISC_WEAKORDER"; - default: - break; + default: return NULL; } - - return NULL; } static const char * @@ -2990,11 +3777,8 @@ get_ia64_segment_type (unsigned long type) case PT_IA_64_HP_OPT_ANOT: return "HP_OPT_ANNOT"; case PT_IA_64_HP_HSL_ANOT: return "HP_HSL_ANNOT"; case PT_IA_64_HP_STACK: return "HP_STACK"; - default: - break; + default: return NULL; } - - return NULL; } static const char * @@ -3002,12 +3786,26 @@ get_tic6x_segment_type (unsigned long type) { switch (type) { - case PT_C6000_PHATTR: return "C6000_PHATTR"; - default: - break; + case PT_C6000_PHATTR: return "C6000_PHATTR"; + default: return NULL; } +} - return NULL; +static const char * +get_solaris_segment_type (unsigned long type) +{ + switch (type) + { + case 0x6464e550: return "PT_SUNW_UNWIND"; + case 0x6474e550: return "PT_SUNW_EH_FRAME"; + case 0x6ffffff7: return "PT_LOSUNW"; + case 0x6ffffffa: return "PT_SUNWBSS"; + case 0x6ffffffb: return "PT_SUNWSTACK"; + case 0x6ffffffc: return "PT_SUNWDTRACE"; + case 0x6ffffffd: return "PT_SUNWCAP"; + case 0x6fffffff: return "PT_HISUNW"; + default: return NULL; + } } static const char * @@ -3025,14 +3823,17 @@ get_segment_type (unsigned long p_type) case PT_SHLIB: return "SHLIB"; case PT_PHDR: return "PHDR"; case PT_TLS: return "TLS"; - - case PT_GNU_EH_FRAME: - return "GNU_EH_FRAME"; + case PT_GNU_EH_FRAME: return "GNU_EH_FRAME"; case PT_GNU_STACK: return "GNU_STACK"; case PT_GNU_RELRO: return "GNU_RELRO"; default: - if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) + if (p_type >= PT_GNU_MBIND_LO && p_type <= PT_GNU_MBIND_HI) + { + sprintf (buff, "GNU_MBIND+%#lx", + p_type - PT_GNU_MBIND_LO); + } + else if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) { const char * result; @@ -3065,7 +3866,7 @@ get_segment_type (unsigned long p_type) if (result != NULL) return result; - sprintf (buff, "LOPROC+%lx", p_type - PT_LOPROC); + sprintf (buff, "LOPROC+%#lx", p_type - PT_LOPROC); } else if ((p_type >= PT_LOOS) && (p_type <= PT_HIOS)) { @@ -3080,14 +3881,17 @@ get_segment_type (unsigned long p_type) result = get_ia64_segment_type (p_type); break; default: - result = NULL; + if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + result = get_solaris_segment_type (p_type); + else + result = NULL; break; } if (result != NULL) return result; - sprintf (buff, "LOOS+%lx", p_type - PT_LOOS); + sprintf (buff, "LOOS+%#lx", p_type - PT_LOOS); } else snprintf (buff, sizeof (buff), _(": %lx"), p_type); @@ -3096,6 +3900,18 @@ get_segment_type (unsigned long p_type) } } +static const char * +get_arc_section_type_name (unsigned int sh_type) +{ + switch (sh_type) + { + case SHT_ARC_ATTRIBUTES: return "ARC_ATTRIBUTES"; + default: + break; + } + return NULL; +} + static const char * get_mips_section_type_name (unsigned int sh_type) { @@ -3140,6 +3956,7 @@ get_mips_section_type_name (unsigned int sh_type) case SHT_MIPS_EH_REGION: return "MIPS_EH_REGION"; case SHT_MIPS_XLATE_OLD: return "MIPS_XLATE_OLD"; case SHT_MIPS_PDR_EXCEPTION: return "MIPS_PDR_EXCEPTION"; + case SHT_MIPS_ABIFLAGS: return "MIPS_ABIFLAGS"; default: break; } @@ -3158,10 +3975,8 @@ get_parisc_section_type_name (unsigned int sh_type) case SHT_PARISC_SYMEXTN: return "PARISC_SYMEXTN"; case SHT_PARISC_STUBS: return "PARISC_STUBS"; case SHT_PARISC_DLKM: return "PARISC_DLKM"; - default: - break; + default: return NULL; } - return NULL; } static const char * @@ -3195,10 +4010,8 @@ get_x86_64_section_type_name (unsigned int sh_type) switch (sh_type) { case SHT_X86_64_UNWIND: return "X86_64_UNWIND"; - default: - break; + default: return NULL; } - return NULL; } static const char * @@ -3206,12 +4019,9 @@ get_aarch64_section_type_name (unsigned int sh_type) { switch (sh_type) { - case SHT_AARCH64_ATTRIBUTES: - return "AARCH64_ATTRIBUTES"; - default: - break; + case SHT_AARCH64_ATTRIBUTES: return "AARCH64_ATTRIBUTES"; + default: return NULL; } - return NULL; } static const char * @@ -3224,10 +4034,8 @@ get_arm_section_type_name (unsigned int sh_type) case SHT_ARM_ATTRIBUTES: return "ARM_ATTRIBUTES"; case SHT_ARM_DEBUGOVERLAY: return "ARM_DEBUGOVERLAY"; case SHT_ARM_OVERLAYSECTION: return "ARM_OVERLAYSECTION"; - default: - break; + default: return NULL; } - return NULL; } static const char * @@ -3235,26 +4043,16 @@ get_tic6x_section_type_name (unsigned int sh_type) { switch (sh_type) { - case SHT_C6000_UNWIND: - return "C6000_UNWIND"; - case SHT_C6000_PREEMPTMAP: - return "C6000_PREEMPTMAP"; - case SHT_C6000_ATTRIBUTES: - return "C6000_ATTRIBUTES"; - case SHT_TI_ICODE: - return "TI_ICODE"; - case SHT_TI_XREF: - return "TI_XREF"; - case SHT_TI_HANDLER: - return "TI_HANDLER"; - case SHT_TI_INITINFO: - return "TI_INITINFO"; - case SHT_TI_PHATTRS: - return "TI_PHATTRS"; - default: - break; + case SHT_C6000_UNWIND: return "C6000_UNWIND"; + case SHT_C6000_PREEMPTMAP: return "C6000_PREEMPTMAP"; + case SHT_C6000_ATTRIBUTES: return "C6000_ATTRIBUTES"; + case SHT_TI_ICODE: return "TI_ICODE"; + case SHT_TI_XREF: return "TI_XREF"; + case SHT_TI_HANDLER: return "TI_HANDLER"; + case SHT_TI_INITINFO: return "TI_INITINFO"; + case SHT_TI_PHATTRS: return "TI_PHATTRS"; + default: return NULL; } - return NULL; } static const char * @@ -3262,17 +4060,32 @@ get_msp430x_section_type_name (unsigned int sh_type) { switch (sh_type) { - case SHT_MSP430_SEC_FLAGS: return "MSP430_SEC_FLAGS"; - case SHT_MSP430_SYM_ALIASES: return "MSP430_SYM_ALIASES"; - case SHT_MSP430_ATTRIBUTES: return "MSP430_ATTRIBUTES"; - default: return NULL; + case SHT_MSP430_SEC_FLAGS: return "MSP430_SEC_FLAGS"; + case SHT_MSP430_SYM_ALIASES: return "MSP430_SYM_ALIASES"; + case SHT_MSP430_ATTRIBUTES: return "MSP430_ATTRIBUTES"; + default: return NULL; } } static const char * -get_section_type_name (unsigned int sh_type) +get_v850_section_type_name (unsigned int sh_type) +{ + switch (sh_type) + { + case SHT_V850_SCOMMON: return "V850 Small Common"; + case SHT_V850_TCOMMON: return "V850 Tiny Common"; + case SHT_V850_ZCOMMON: return "V850 Zero Common"; + case SHT_RENESAS_IOP: return "RENESAS IOP"; + case SHT_RENESAS_INFO: return "RENESAS INFO"; + default: return NULL; + } +} + +static const char * +get_section_type_name (unsigned int sh_type) { static char buff[32]; + const char * result; switch (sh_type) { @@ -3306,10 +4119,13 @@ get_section_type_name (unsigned int sh_type) default: if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC)) { - const char * result; - switch (elf_header.e_machine) { + case EM_ARC: + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: + result = get_arc_section_type_name (sh_type); + break; case EM_MIPS: case EM_MIPS_RS3_LE: result = get_mips_section_type_name (sh_type); @@ -3337,6 +4153,11 @@ get_section_type_name (unsigned int sh_type) case EM_MSP430: result = get_msp430x_section_type_name (sh_type); break; + case EM_V800: + case EM_V850: + case EM_CYGNUS_V850: + result = get_v850_section_type_name (sh_type); + break; default: result = NULL; break; @@ -3345,29 +4166,58 @@ get_section_type_name (unsigned int sh_type) if (result != NULL) return result; - sprintf (buff, "LOPROC+%x", sh_type - SHT_LOPROC); + sprintf (buff, "LOPROC+%#x", sh_type - SHT_LOPROC); } else if ((sh_type >= SHT_LOOS) && (sh_type <= SHT_HIOS)) { - const char * result; - switch (elf_header.e_machine) { case EM_IA_64: result = get_ia64_section_type_name (sh_type); break; default: - result = NULL; + if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + result = get_solaris_section_type (sh_type); + else + { + switch (sh_type) + { + case SHT_GNU_INCREMENTAL_INPUTS: result = "GNU_INCREMENTAL_INPUTS"; break; + case SHT_GNU_ATTRIBUTES: result = "GNU_ATTRIBUTES"; break; + case SHT_GNU_HASH: result = "GNU_HASH"; break; + case SHT_GNU_LIBLIST: result = "GNU_LIBLIST"; break; + default: + result = NULL; + break; + } + } break; } if (result != NULL) return result; - sprintf (buff, "LOOS+%x", sh_type - SHT_LOOS); + sprintf (buff, "LOOS+%#x", sh_type - SHT_LOOS); } else if ((sh_type >= SHT_LOUSER) && (sh_type <= SHT_HIUSER)) - sprintf (buff, "LOUSER+%x", sh_type - SHT_LOUSER); + { + switch (elf_header.e_machine) + { + case EM_V800: + case EM_V850: + case EM_CYGNUS_V850: + result = get_v850_section_type_name (sh_type); + break; + default: + result = NULL; + break; + } + + if (result != NULL) + return result; + + sprintf (buff, "LOUSER+%#x", sh_type - SHT_LOUSER); + } else /* This message is probably going to be displayed in a 15 character wide field, so put the hex value first. */ @@ -3410,6 +4260,7 @@ static struct option options[] = {"hex-dump", required_argument, 0, 'x'}, {"relocated-dump", required_argument, 0, 'R'}, {"string-dump", required_argument, 0, 'p'}, + {"decompress", no_argument, 0, 'z'}, #ifdef SUPPORT_DISASSEMBLY {"instruction-dump", required_argument, 0, 'i'}, #endif @@ -3457,6 +4308,7 @@ usage (FILE * stream) Dump the contents of section as strings\n\ -R --relocated-dump=\n\ Dump the contents of section as relocated bytes\n\ + -z --decompress Decompress section before dumping it\n\ -w[lLiaprmfFsoRt] or\n\ --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n\ =frames-interp,=str,=loc,=Ranges,=pubtypes,\n\ @@ -3504,10 +4356,13 @@ request_dump_bynumber (unsigned int section, dump_type type) error (_("Out of memory allocating dump request table.\n")); else { - /* Copy current flag settings. */ - memcpy (new_dump_sects, dump_sects, num_dump_sects * sizeof (* dump_sects)); + if (dump_sects) + { + /* Copy current flag settings. */ + memcpy (new_dump_sects, dump_sects, num_dump_sects * sizeof (* dump_sects)); - free (dump_sects); + free (dump_sects); + } dump_sects = new_dump_sects; num_dump_sects = section + 1; @@ -3567,7 +4422,7 @@ parse_args (int argc, char ** argv) usage (stderr); while ((c = getopt_long - (argc, argv, "ADHINR:SVWacdeghi:lnp:rstuvw::x:", options, NULL)) != EOF) + (argc, argv, "ADHINR:SVWacdeghi:lnp:rstuvw::x:z", options, NULL)) != EOF) { switch (c) { @@ -3579,67 +4434,67 @@ parse_args (int argc, char ** argv) break; case 'a': - do_syms++; - do_reloc++; - do_unwind++; - do_dynamic++; - do_header++; - do_sections++; - do_section_groups++; - do_segments++; - do_version++; - do_histogram++; - do_arch++; - do_notes++; + do_syms = TRUE; + do_reloc = TRUE; + do_unwind = TRUE; + do_dynamic = TRUE; + do_header = TRUE; + do_sections = TRUE; + do_section_groups = TRUE; + do_segments = TRUE; + do_version = TRUE; + do_histogram = TRUE; + do_arch = TRUE; + do_notes = TRUE; break; case 'g': - do_section_groups++; + do_section_groups = TRUE; break; case 't': case 'N': - do_sections++; - do_section_details++; + do_sections = TRUE; + do_section_details = TRUE; break; case 'e': - do_header++; - do_sections++; - do_segments++; + do_header = TRUE; + do_sections = TRUE; + do_segments = TRUE; break; case 'A': - do_arch++; + do_arch = TRUE; break; case 'D': - do_using_dynamic++; + do_using_dynamic = TRUE; break; case 'r': - do_reloc++; + do_reloc = TRUE; break; case 'u': - do_unwind++; + do_unwind = TRUE; break; case 'h': - do_header++; + do_header = TRUE; break; case 'l': - do_segments++; + do_segments = TRUE; break; case 's': - do_syms++; + do_syms = TRUE; break; case 'S': - do_sections++; + do_sections = TRUE; break; case 'd': - do_dynamic++; + do_dynamic = TRUE; break; case 'I': - do_histogram++; + do_histogram = TRUE; break; case 'n': - do_notes++; + do_notes = TRUE; break; case 'c': - do_archive_index++; + do_archive_index = TRUE; break; case 'x': request_dump (HEX_DUMP); @@ -3650,26 +4505,29 @@ parse_args (int argc, char ** argv) case 'R': request_dump (RELOC_DUMP); break; + case 'z': + decompress_dumps = TRUE; + break; case 'w': - do_dump++; + do_dump = TRUE; if (optarg == 0) { - do_debugging = 1; + do_debugging = TRUE; dwarf_select_sections_all (); } else { - do_debugging = 0; + do_debugging = FALSE; dwarf_select_sections_by_letters (optarg); } break; case OPTION_DEBUG_DUMP: - do_dump++; + do_dump = TRUE; if (optarg == 0) - do_debugging = 1; + do_debugging = TRUE; else { - do_debugging = 0; + do_debugging = FALSE; dwarf_select_sections_by_names (optarg); } break; @@ -3688,10 +4546,10 @@ parse_args (int argc, char ** argv) } break; case OPTION_DWARF_CHECK: - dwarf_check = 1; + dwarf_check = TRUE; break; case OPTION_DYN_SYMS: - do_dyn_syms++; + do_dyn_syms = TRUE; break; #ifdef SUPPORT_DISASSEMBLY case 'i': @@ -3702,15 +4560,15 @@ parse_args (int argc, char ** argv) print_version (program_name); break; case 'V': - do_version++; + do_version = TRUE; break; case 'W': - do_wide++; + do_wide = TRUE; break; default: /* xgettext:c-format */ error (_("Invalid option '-%c'\n"), c); - /* Drop through. */ + /* Fall through. */ case '?': usage (stderr); } @@ -3722,11 +4580,6 @@ parse_args (int argc, char ** argv) && !do_section_groups && !do_archive_index && !do_dyn_syms) usage (stderr); - else if (argc < 3) - { - warn (_("Nothing to do.\n")); - usage (stderr); - } } static const char * @@ -3763,7 +4616,7 @@ get_data_encoding (unsigned int encoding) /* Decode the data held in 'elf_header'. */ -static int +static bfd_boolean process_file_header (void) { if ( elf_header.e_ident[EI_MAG0] != ELFMAG0 @@ -3773,14 +4626,14 @@ process_file_header (void) { error (_("Not an ELF file - it has the wrong magic bytes at the start\n")); - return 0; + return FALSE; } init_dwarf_regnames (elf_header.e_machine); if (do_header) { - int i; + unsigned i; printf (_("ELF Header:\n")); printf (_(" Magic: ")); @@ -3864,24 +4717,34 @@ process_file_header (void) section_headers = NULL; } - return 1; + return TRUE; } - -static int +static bfd_boolean get_32bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) { Elf32_External_Phdr * phdrs; Elf32_External_Phdr * external; Elf_Internal_Phdr * internal; unsigned int i; + unsigned int size = elf_header.e_phentsize; + unsigned int num = elf_header.e_phnum; + + /* PR binutils/17531: Cope with unexpected section header sizes. */ + if (size == 0 || num == 0) + return FALSE; + if (size < sizeof * phdrs) + { + error (_("The e_phentsize field in the ELF header is less than the size of an ELF program header\n")); + return FALSE; + } + if (size > sizeof * phdrs) + warn (_("The e_phentsize field in the ELF header is larger than the size of an ELF program header\n")); phdrs = (Elf32_External_Phdr *) get_data (NULL, file, elf_header.e_phoff, - elf_header.e_phentsize, - elf_header.e_phnum, - _("program headers")); - if (!phdrs) - return 0; + size, num, _("program headers")); + if (phdrs == NULL) + return FALSE; for (i = 0, internal = pheaders, external = phdrs; i < elf_header.e_phnum; @@ -3898,24 +4761,34 @@ get_32bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) } free (phdrs); - - return 1; + return TRUE; } -static int +static bfd_boolean get_64bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) { Elf64_External_Phdr * phdrs; Elf64_External_Phdr * external; Elf_Internal_Phdr * internal; unsigned int i; + unsigned int size = elf_header.e_phentsize; + unsigned int num = elf_header.e_phnum; + + /* PR binutils/17531: Cope with unexpected section header sizes. */ + if (size == 0 || num == 0) + return FALSE; + if (size < sizeof * phdrs) + { + error (_("The e_phentsize field in the ELF header is less than the size of an ELF program header\n")); + return FALSE; + } + if (size > sizeof * phdrs) + warn (_("The e_phentsize field in the ELF header is larger than the size of an ELF program header\n")); phdrs = (Elf64_External_Phdr *) get_data (NULL, file, elf_header.e_phoff, - elf_header.e_phentsize, - elf_header.e_phnum, - _("program headers")); + size, num, _("program headers")); if (!phdrs) - return 0; + return FALSE; for (i = 0, internal = pheaders, external = phdrs; i < elf_header.e_phnum; @@ -3932,28 +4805,38 @@ get_64bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) } free (phdrs); - - return 1; + return TRUE; } -/* Returns 1 if the program headers were read into `program_headers'. */ +/* Returns TRUE if the program headers were read into `program_headers'. */ -static int +static bfd_boolean get_program_headers (FILE * file) { Elf_Internal_Phdr * phdrs; /* Check cache of prior read. */ if (program_headers != NULL) - return 1; + return TRUE; - phdrs = (Elf_Internal_Phdr *) cmalloc (elf_header.e_phnum, - sizeof (Elf_Internal_Phdr)); + /* Be kind to memory checkers by looking for + e_phnum values which we know must be invalid. */ + if (elf_header.e_phnum + * (is_32bit_elf ? sizeof (Elf32_External_Phdr) : sizeof (Elf64_External_Phdr)) + >= current_file_size) + { + error (_("Too many program headers - %#x - the file is not that big\n"), + elf_header.e_phnum); + return FALSE; + } + phdrs = (Elf_Internal_Phdr *) cmalloc (elf_header.e_phnum, + sizeof (Elf_Internal_Phdr)); if (phdrs == NULL) { - error (_("Out of memory\n")); - return 0; + error (_("Out of memory reading %u program headers\n"), + elf_header.e_phnum); + return FALSE; } if (is_32bit_elf @@ -3961,30 +4844,34 @@ get_program_headers (FILE * file) : get_64bit_program_headers (file, phdrs)) { program_headers = phdrs; - return 1; + return TRUE; } free (phdrs); - return 0; + return FALSE; } -/* Returns 1 if the program headers were loaded. */ +/* Returns TRUE if the program headers were loaded. */ -static int +static bfd_boolean process_program_headers (FILE * file) { Elf_Internal_Phdr * segment; unsigned int i; + Elf_Internal_Phdr * previous_load = NULL; if (elf_header.e_phnum == 0) { /* PR binutils/12467. */ if (elf_header.e_phoff != 0) - warn (_("possibly corrupt ELF header - it has a non-zero program" - " header offset, but no program headers")); + { + warn (_("possibly corrupt ELF header - it has a non-zero program" + " header offset, but no program headers\n")); + return FALSE; + } else if (do_segments) printf (_("\nThere are no program headers in this file.\n")); - return 0; + return TRUE; } if (do_segments && !do_header) @@ -3999,7 +4886,7 @@ process_program_headers (FILE * file) } if (! get_program_headers (file)) - return 0; + return TRUE; if (do_segments) { @@ -4104,12 +4991,45 @@ process_program_headers (FILE * file) (segment->p_flags & PF_R ? 'R' : ' '), (segment->p_flags & PF_W ? 'W' : ' '), (segment->p_flags & PF_X ? 'E' : ' ')); - print_vma (segment->p_align, HEX); + print_vma (segment->p_align, PREFIX_HEX); } + + putc ('\n', stdout); } switch (segment->p_type) { + case PT_LOAD: +#if 0 /* Do not warn about out of order PT_LOAD segments. Although officially + required by the ELF standard, several programs, including the Linux + kernel, make use of non-ordered segments. */ + if (previous_load + && previous_load->p_vaddr > segment->p_vaddr) + error (_("LOAD segments must be sorted in order of increasing VirtAddr\n")); +#endif + if (segment->p_memsz < segment->p_filesz) + error (_("the segment's file size is larger than its memory size\n")); + previous_load = segment; + break; + + case PT_PHDR: + /* PR 20815 - Verify that the program header is loaded into memory. */ + if (i > 0 && previous_load != NULL) + error (_("the PHDR segment must occur before any LOAD segment\n")); + if (elf_header.e_machine != EM_PARISC) + { + unsigned int j; + + for (j = 1; j < elf_header.e_phnum; j++) + if (program_headers[j].p_vaddr <= segment->p_vaddr + && (program_headers[j].p_vaddr + program_headers[j].p_memsz) + >= (segment->p_vaddr + segment->p_filesz)) + break; + if (j == elf_header.e_phnum) + error (_("the PHDR segment is not covered by a LOAD segment\n")); + } + break; + case PT_DYNAMIC: if (dynamic_addr) error (_("more than one dynamic segment\n")); @@ -4152,6 +5072,16 @@ process_program_headers (FILE * file) warn (_("the .dynamic section is not the first section" " in the dynamic segment.\n")); } + + /* PR binutils/17512: Avoid corrupt dynamic section info in the + segment. Check this after matching against the section headers + so we don't warn on debuginfo file (which have NOBITS .dynamic + sections). */ + if (dynamic_addr + dynamic_size >= current_file_size) + { + error (_("the dynamic segment offset + size exceeds the size of the file\n")); + dynamic_addr = dynamic_size = 0; + } break; case PT_INTERP: @@ -4161,7 +5091,7 @@ process_program_headers (FILE * file) else { char fmt [32]; - int ret = snprintf (fmt, sizeof (fmt), "%%%ds", PATH_MAX); + int ret = snprintf (fmt, sizeof (fmt), "%%%ds", PATH_MAX - 1); if (ret >= (int) sizeof (fmt) || ret < 0) error (_("Internal error: failed to create format string to display program interpreter\n")); @@ -4171,14 +5101,11 @@ process_program_headers (FILE * file) error (_("Unable to read program interpreter name\n")); if (do_segments) - printf (_("\n [Requesting program interpreter: %s]"), + printf (_(" [Requesting program interpreter: %s]\n"), program_interpreter); } break; } - - if (do_segments) - putc ('\n', stdout); } if (do_segments && section_headers != NULL && string_table != NULL) @@ -4200,14 +5127,14 @@ process_program_headers (FILE * file) { if (!ELF_TBSS_SPECIAL (section, segment) && ELF_SECTION_IN_SEGMENT_STRICT (section, segment)) - printf ("%s ", SECTION_NAME (section)); + printf ("%s ", printable_section_name (section)); } putc ('\n',stdout); } } - return 1; + return TRUE; } @@ -4242,26 +5169,46 @@ offset_from_vma (FILE * file, bfd_vma vma, bfd_size_type size) } -static int -get_32bit_section_headers (FILE * file, unsigned int num) +/* Allocate memory and load the sections headers into the global pointer + SECTION_HEADERS. If PROBE is true, this is just a probe and we do not + generate any error messages if the load fails. */ + +static bfd_boolean +get_32bit_section_headers (FILE * file, bfd_boolean probe) { Elf32_External_Shdr * shdrs; Elf_Internal_Shdr * internal; unsigned int i; + unsigned int size = elf_header.e_shentsize; + unsigned int num = probe ? 1 : elf_header.e_shnum; + + /* PR binutils/17531: Cope with unexpected section header sizes. */ + if (size == 0 || num == 0) + return FALSE; + if (size < sizeof * shdrs) + { + if (! probe) + error (_("The e_shentsize field in the ELF header is less than the size of an ELF section header\n")); + return FALSE; + } + if (!probe && size > sizeof * shdrs) + warn (_("The e_shentsize field in the ELF header is larger than the size of an ELF section header\n")); shdrs = (Elf32_External_Shdr *) get_data (NULL, file, elf_header.e_shoff, - elf_header.e_shentsize, num, - _("section headers")); - if (!shdrs) - return 0; + size, num, + probe ? NULL : _("section headers")); + if (shdrs == NULL) + return FALSE; + if (section_headers != NULL) + free (section_headers); section_headers = (Elf_Internal_Shdr *) cmalloc (num, sizeof (Elf_Internal_Shdr)); - if (section_headers == NULL) { - error (_("Out of memory\n")); - return 0; + if (!probe) + error (_("Out of memory reading %u section headers\n"), num); + return FALSE; } for (i = 0, internal = section_headers; @@ -4278,33 +5225,52 @@ get_32bit_section_headers (FILE * file, unsigned int num) internal->sh_info = BYTE_GET (shdrs[i].sh_info); internal->sh_addralign = BYTE_GET (shdrs[i].sh_addralign); internal->sh_entsize = BYTE_GET (shdrs[i].sh_entsize); + if (!probe && internal->sh_link > num) + warn (_("Section %u has an out of range sh_link value of %u\n"), i, internal->sh_link); + if (!probe && internal->sh_flags & SHF_INFO_LINK && internal->sh_info > num) + warn (_("Section %u has an out of range sh_info value of %u\n"), i, internal->sh_info); } free (shdrs); - - return 1; + return TRUE; } -static int -get_64bit_section_headers (FILE * file, unsigned int num) +static bfd_boolean +get_64bit_section_headers (FILE * file, bfd_boolean probe) { Elf64_External_Shdr * shdrs; Elf_Internal_Shdr * internal; unsigned int i; + unsigned int size = elf_header.e_shentsize; + unsigned int num = probe ? 1 : elf_header.e_shnum; + + /* PR binutils/17531: Cope with unexpected section header sizes. */ + if (size == 0 || num == 0) + return FALSE; + if (size < sizeof * shdrs) + { + if (! probe) + error (_("The e_shentsize field in the ELF header is less than the size of an ELF section header\n")); + return FALSE; + } + if (! probe && size > sizeof * shdrs) + warn (_("The e_shentsize field in the ELF header is larger than the size of an ELF section header\n")); shdrs = (Elf64_External_Shdr *) get_data (NULL, file, elf_header.e_shoff, - elf_header.e_shentsize, num, - _("section headers")); - if (!shdrs) - return 0; + size, num, + probe ? NULL : _("section headers")); + if (shdrs == NULL) + return FALSE; + if (section_headers != NULL) + free (section_headers); section_headers = (Elf_Internal_Shdr *) cmalloc (num, sizeof (Elf_Internal_Shdr)); - if (section_headers == NULL) { - error (_("Out of memory\n")); - return 0; + if (! probe) + error (_("Out of memory reading %u section headers\n"), num); + return FALSE; } for (i = 0, internal = section_headers; @@ -4321,11 +5287,14 @@ get_64bit_section_headers (FILE * file, unsigned int num) internal->sh_info = BYTE_GET (shdrs[i].sh_info); internal->sh_offset = BYTE_GET (shdrs[i].sh_offset); internal->sh_addralign = BYTE_GET (shdrs[i].sh_addralign); + if (!probe && internal->sh_link > num) + warn (_("Section %u has an out of range sh_link value of %u\n"), i, internal->sh_link); + if (!probe && internal->sh_flags & SHF_INFO_LINK && internal->sh_info > num) + warn (_("Section %u has an out of range sh_info value of %u\n"), i, internal->sh_info); } free (shdrs); - - return 1; + return TRUE; } static Elf_Internal_Sym * @@ -4340,10 +5309,25 @@ get_32bit_elf_symbols (FILE * file, Elf_Internal_Sym * psym; unsigned int j; + if (section->sh_size == 0) + { + if (num_syms_return != NULL) + * num_syms_return = 0; + return NULL; + } + /* Run some sanity checks first. */ - if (section->sh_entsize == 0) + if (section->sh_entsize == 0 || section->sh_entsize > section->sh_size) + { + error (_("Section %s has an invalid sh_entsize of 0x%lx\n"), + printable_section_name (section), (unsigned long) section->sh_entsize); + goto exit_point; + } + + if (section->sh_size > current_file_size) { - error (_("sh_entsize is zero\n")); + error (_("Section %s has an invalid sh_size of 0x%lx\n"), + printable_section_name (section), (unsigned long) section->sh_size); goto exit_point; } @@ -4351,7 +5335,10 @@ get_32bit_elf_symbols (FILE * file, if (number * sizeof (Elf32_External_Sym) > section->sh_size + 1) { - error (_("Invalid sh_entsize\n")); + error (_("Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n"), + (unsigned long) section->sh_size, + printable_section_name (section), + (unsigned long) section->sh_entsize); goto exit_point; } @@ -4360,24 +5347,37 @@ get_32bit_elf_symbols (FILE * file, if (esyms == NULL) goto exit_point; - shndx = NULL; - if (symtab_shndx_hdr != NULL - && (symtab_shndx_hdr->sh_link - == (unsigned long) (section - section_headers))) - { - shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file, - symtab_shndx_hdr->sh_offset, - 1, symtab_shndx_hdr->sh_size, - _("symbol table section indicies")); - if (shndx == NULL) - goto exit_point; - } + { + elf_section_list * entry; + + shndx = NULL; + for (entry = symtab_shndx_list; entry != NULL; entry = entry->next) + if (entry->hdr->sh_link == (unsigned long) (section - section_headers)) + { + shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file, + entry->hdr->sh_offset, + 1, entry->hdr->sh_size, + _("symbol table section indicies")); + if (shndx == NULL) + goto exit_point; + /* PR17531: file: heap-buffer-overflow */ + else if (entry->hdr->sh_size / sizeof (Elf_External_Sym_Shndx) < number) + { + error (_("Index section %s has an sh_size of 0x%lx - expected 0x%lx\n"), + printable_section_name (entry->hdr), + (unsigned long) entry->hdr->sh_size, + (unsigned long) section->sh_size); + goto exit_point; + } + } + } isyms = (Elf_Internal_Sym *) cmalloc (number, sizeof (Elf_Internal_Sym)); if (isyms == NULL) { - error (_("Out of memory\n")); + error (_("Out of memory reading %lu symbols\n"), + (unsigned long) number); goto exit_point; } @@ -4420,10 +5420,27 @@ get_64bit_elf_symbols (FILE * file, Elf_Internal_Sym * psym; unsigned int j; + if (section->sh_size == 0) + { + if (num_syms_return != NULL) + * num_syms_return = 0; + return NULL; + } + /* Run some sanity checks first. */ - if (section->sh_entsize == 0) + if (section->sh_entsize == 0 || section->sh_entsize > section->sh_size) + { + error (_("Section %s has an invalid sh_entsize of 0x%lx\n"), + printable_section_name (section), + (unsigned long) section->sh_entsize); + goto exit_point; + } + + if (section->sh_size > current_file_size) { - error (_("sh_entsize is zero\n")); + error (_("Section %s has an invalid sh_size of 0x%lx\n"), + printable_section_name (section), + (unsigned long) section->sh_size); goto exit_point; } @@ -4431,7 +5448,10 @@ get_64bit_elf_symbols (FILE * file, if (number * sizeof (Elf64_External_Sym) > section->sh_size + 1) { - error (_("Invalid sh_entsize\n")); + error (_("Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n"), + (unsigned long) section->sh_size, + printable_section_name (section), + (unsigned long) section->sh_entsize); goto exit_point; } @@ -4440,23 +5460,37 @@ get_64bit_elf_symbols (FILE * file, if (!esyms) goto exit_point; - if (symtab_shndx_hdr != NULL - && (symtab_shndx_hdr->sh_link - == (unsigned long) (section - section_headers))) - { - shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file, - symtab_shndx_hdr->sh_offset, - 1, symtab_shndx_hdr->sh_size, - _("symbol table section indicies")); - if (shndx == NULL) - goto exit_point; - } + { + elf_section_list * entry; + + shndx = NULL; + for (entry = symtab_shndx_list; entry != NULL; entry = entry->next) + if (entry->hdr->sh_link == (unsigned long) (section - section_headers)) + { + shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file, + entry->hdr->sh_offset, + 1, entry->hdr->sh_size, + _("symbol table section indicies")); + if (shndx == NULL) + goto exit_point; + /* PR17531: file: heap-buffer-overflow */ + else if (entry->hdr->sh_size / sizeof (Elf_External_Sym_Shndx) < number) + { + error (_("Index section %s has an sh_size of 0x%lx - expected 0x%lx\n"), + printable_section_name (entry->hdr), + (unsigned long) entry->hdr->sh_size, + (unsigned long) section->sh_size); + goto exit_point; + } + } + } isyms = (Elf_Internal_Sym *) cmalloc (number, sizeof (Elf_Internal_Sym)); if (isyms == NULL) { - error (_("Out of memory\n")); + error (_("Out of memory reading %lu symbols\n"), + (unsigned long) number); goto exit_point; } @@ -4494,16 +5528,16 @@ get_elf_section_flags (bfd_vma sh_flags) { static char buff[1024]; char * p = buff; - int field_size = is_32bit_elf ? 8 : 16; - int sindex; - int size = sizeof (buff) - (field_size + 4 + 1); + unsigned int field_size = is_32bit_elf ? 8 : 16; + signed int sindex; + unsigned int size = sizeof (buff) - (field_size + 4 + 1); bfd_vma os_flags = 0; bfd_vma proc_flags = 0; bfd_vma unknown_flags = 0; static const struct { const char * str; - int len; + unsigned int len; } flags [] = { @@ -4530,7 +5564,14 @@ get_elf_section_flags (bfd_vma sh_flags) /* Generic. */ /* 18 */ { STRING_COMMA_LEN ("EXCLUDE") }, /* SPARC specific. */ - /* 19 */ { STRING_COMMA_LEN ("ORDERED") } + /* 19 */ { STRING_COMMA_LEN ("ORDERED") }, + /* 20 */ { STRING_COMMA_LEN ("COMPRESSED") }, + /* ARM specific. */ + /* 21 */ { STRING_COMMA_LEN ("ENTRYSECT") }, + /* 22 */ { STRING_COMMA_LEN ("ARM_PURECODE") }, + /* 23 */ { STRING_COMMA_LEN ("COMDEF") }, + /* GNU specific. */ + /* 24 */ { STRING_COMMA_LEN ("GNU_MBIND") }, }; if (do_section_details) @@ -4562,6 +5603,8 @@ get_elf_section_flags (bfd_vma sh_flags) case SHF_GROUP: sindex = 8; break; case SHF_TLS: sindex = 9; break; case SHF_EXCLUDE: sindex = 18; break; + case SHF_COMPRESSED: sindex = 20; break; + case SHF_GNU_MBIND: sindex = 24; break; default: sindex = -1; @@ -4588,7 +5631,7 @@ get_elf_section_flags (bfd_vma sh_flags) break; case EM_386: - case EM_486: + case EM_IAMCU: case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -4599,6 +5642,17 @@ get_elf_section_flags (bfd_vma sh_flags) if (flag == SHF_ORDERED) sindex = 19; break; + + case EM_ARM: + switch (flag) + { + case SHF_ENTRYSECT: sindex = 21; break; + case SHF_ARM_PURECODE: sindex = 22; break; + case SHF_COMDEF: sindex = 23; break; + default: break; + } + break; + default: break; } @@ -4609,7 +5663,10 @@ get_elf_section_flags (bfd_vma sh_flags) if (p != buff + field_size + 4) { if (size < (10 + 2)) - abort (); + { + warn (_("Internal error: not enough buffer room for section flag info")); + return _(""); + } size -= 2; *p++ = ','; *p++ = ' '; @@ -4640,6 +5697,8 @@ get_elf_section_flags (bfd_vma sh_flags) case SHF_GROUP: *p = 'G'; break; case SHF_TLS: *p = 'T'; break; case SHF_EXCLUDE: *p = 'E'; break; + case SHF_COMPRESSED: *p = 'C'; break; + case SHF_GNU_MBIND: *p = 'D'; break; default: if ((elf_header.e_machine == EM_X86_64 @@ -4647,6 +5706,9 @@ get_elf_section_flags (bfd_vma sh_flags) || elf_header.e_machine == EM_K1OM) && flag == SHF_X86_64_LARGE) *p = 'l'; + else if (elf_header.e_machine == EM_ARM + && flag == SHF_ARM_PURECODE) + *p = 'y'; else if (flag & SHF_MASKOS) { *p = 'o'; @@ -4673,7 +5735,10 @@ get_elf_section_flags (bfd_vma sh_flags) if (p != buff + field_size + 4) { if (size < (2 + 1)) - abort (); + { + warn (_("Internal error: not enough buffer room for section flag info")); + return _(""); + } size -= 2; *p++ = ','; *p++ = ' '; @@ -4688,7 +5753,10 @@ get_elf_section_flags (bfd_vma sh_flags) if (p != buff + field_size + 4) { if (size < (2 + 1)) - abort (); + { + warn (_("Internal error: not enough buffer room for section flag info")); + return _(""); + } size -= 2; *p++ = ','; *p++ = ' '; @@ -4703,7 +5771,10 @@ get_elf_section_flags (bfd_vma sh_flags) if (p != buff + field_size + 4) { if (size < (2 + 1)) - abort (); + { + warn (_("Internal error: not enough buffer room for section flag info")); + return _(""); + } size -= 2; *p++ = ','; *p++ = ' '; @@ -4718,7 +5789,42 @@ get_elf_section_flags (bfd_vma sh_flags) return buff; } -static int +static unsigned int +get_compression_header (Elf_Internal_Chdr *chdr, unsigned char *buf, bfd_size_type size) +{ + if (is_32bit_elf) + { + Elf32_External_Chdr *echdr = (Elf32_External_Chdr *) buf; + + if (size < sizeof (* echdr)) + { + error (_("Compressed section is too small even for a compression header\n")); + return 0; + } + + chdr->ch_type = BYTE_GET (echdr->ch_type); + chdr->ch_size = BYTE_GET (echdr->ch_size); + chdr->ch_addralign = BYTE_GET (echdr->ch_addralign); + return sizeof (*echdr); + } + else + { + Elf64_External_Chdr *echdr = (Elf64_External_Chdr *) buf; + + if (size < sizeof (* echdr)) + { + error (_("Compressed section is too small even for a compression header\n")); + return 0; + } + + chdr->ch_type = BYTE_GET (echdr->ch_type); + chdr->ch_size = BYTE_GET (echdr->ch_size); + chdr->ch_addralign = BYTE_GET (echdr->ch_addralign); + return sizeof (*echdr); + } +} + +static bfd_boolean process_section_headers (FILE * file) { Elf_Internal_Shdr * section; @@ -4730,12 +5836,15 @@ process_section_headers (FILE * file) { /* PR binutils/12467. */ if (elf_header.e_shoff != 0) - warn (_("possibly corrupt ELF file header - it has a non-zero" - " section header offset, but no section headers\n")); + { + warn (_("possibly corrupt ELF file header - it has a non-zero" + " section header offset, but no section headers\n")); + return FALSE; + } else if (do_sections) printf (_("\nThere are no sections in this file.\n")); - return 1; + return TRUE; } if (do_sections && !do_header) @@ -4744,11 +5853,14 @@ process_section_headers (FILE * file) if (is_32bit_elf) { - if (! get_32bit_section_headers (file, elf_header.e_shnum)) - return 0; + if (! get_32bit_section_headers (file, FALSE)) + return FALSE; + } + else + { + if (! get_64bit_section_headers (file, FALSE)) + return FALSE; } - else if (! get_64bit_section_headers (file, elf_header.e_shnum)) - return 0; /* Read in the string table, so that we have names to display. */ if (elf_header.e_shstrndx != SHN_UNDEF @@ -4771,7 +5883,7 @@ process_section_headers (FILE * file) dynamic_symbols = NULL; dynamic_strings = NULL; dynamic_syminfo = NULL; - symtab_shndx_hdr = NULL; + symtab_shndx_list = NULL; eh_addr_size = is_32bit_elf ? 4 : 8; switch (elf_header.e_machine) @@ -4821,19 +5933,22 @@ process_section_headers (FILE * file) break; } -#define CHECK_ENTSIZE_VALUES(section, i, size32, size64) \ - do \ - { \ - bfd_size_type expected_entsize = is_32bit_elf ? size32 : size64; \ - if (section->sh_entsize != expected_entsize) \ +#define CHECK_ENTSIZE_VALUES(section, i, size32, size64) \ + do \ + { \ + bfd_size_type expected_entsize = is_32bit_elf ? size32 : size64; \ + if (section->sh_entsize != expected_entsize) \ { \ - error (_("Section %d has invalid sh_entsize of %" BFD_VMA_FMT "x\n"), \ - i, section->sh_entsize); \ - error (_("(Using the expected size of %d for the rest of this dump)\n"), \ - (int) expected_entsize); \ + char buf[40]; \ + sprintf_vma (buf, section->sh_entsize); \ + /* Note: coded this way so that there is a single string for \ + translation. */ \ + error (_("Section %d has invalid sh_entsize of %s\n"), i, buf); \ + error (_("(Using the expected size of %u for the rest of this dump)\n"), \ + (unsigned) expected_entsize); \ section->sh_entsize = expected_entsize; \ - } \ - } \ + } \ + } \ while (0) #define CHECK_ENTSIZE(section, i, type) \ @@ -4873,12 +5988,10 @@ process_section_headers (FILE * file) } else if (section->sh_type == SHT_SYMTAB_SHNDX) { - if (symtab_shndx_hdr != NULL) - { - error (_("File contains multiple symtab shndx tables\n")); - continue; - } - symtab_shndx_hdr = section; + elf_section_list * entry = xmalloc (sizeof * entry); + entry->hdr = section; + entry->next = symtab_shndx_list; + symtab_shndx_list = entry; } else if (section->sh_type == SHT_SYMTAB) CHECK_ENTSIZE (section, i, Sym); @@ -4909,13 +6022,17 @@ process_section_headers (FILE * file) || (do_debug_lines && const_strneq (name, "line.")) || (do_debug_pubnames && const_strneq (name, "pubnames")) || (do_debug_pubtypes && const_strneq (name, "pubtypes")) + || (do_debug_pubnames && const_strneq (name, "gnu_pubnames")) + || (do_debug_pubtypes && const_strneq (name, "gnu_pubtypes")) || (do_debug_aranges && const_strneq (name, "aranges")) || (do_debug_ranges && const_strneq (name, "ranges")) + || (do_debug_ranges && const_strneq (name, "rnglists")) || (do_debug_frames && const_strneq (name, "frame")) || (do_debug_macinfo && const_strneq (name, "macinfo")) || (do_debug_macinfo && const_strneq (name, "macro")) || (do_debug_str && const_strneq (name, "str")) || (do_debug_loc && const_strneq (name, "loc")) + || (do_debug_loc && const_strneq (name, "loclists")) || (do_debug_addr && const_strneq (name, "addr")) || (do_debug_cu_index && const_strneq (name, "cu_index")) || (do_debug_cu_index && const_strneq (name, "tu_index")) @@ -4944,11 +6061,10 @@ process_section_headers (FILE * file) ) request_dump_bynumber (i, DEBUG_DUMP); } - } if (! do_sections) - return 1; + return TRUE; if (elf_header.e_shnum > 1) printf (_("\nSection Headers:\n")); @@ -4999,20 +6115,142 @@ process_section_headers (FILE * file) i < elf_header.e_shnum; i++, section++) { - printf (" [%2u] ", i); - if (do_section_details) + /* Run some sanity checks on the section header. */ + + /* Check the sh_link field. */ + switch (section->sh_type) { - print_symbol (INT_MAX, SECTION_NAME (section)); - printf ("\n "); + case SHT_SYMTAB_SHNDX: + case SHT_GROUP: + case SHT_HASH: + case SHT_GNU_HASH: + case SHT_GNU_versym: + case SHT_REL: + case SHT_RELA: + if (section->sh_link < 1 + || section->sh_link >= elf_header.e_shnum + || (section_headers[section->sh_link].sh_type != SHT_SYMTAB + && section_headers[section->sh_link].sh_type != SHT_DYNSYM)) + warn (_("[%2u]: Link field (%u) should index a symtab section.\n"), + i, section->sh_link); + break; + + case SHT_DYNAMIC: + case SHT_SYMTAB: + case SHT_DYNSYM: + case SHT_GNU_verneed: + case SHT_GNU_verdef: + case SHT_GNU_LIBLIST: + if (section->sh_link < 1 + || section->sh_link >= elf_header.e_shnum + || section_headers[section->sh_link].sh_type != SHT_STRTAB) + warn (_("[%2u]: Link field (%u) should index a string section.\n"), + i, section->sh_link); + break; + + case SHT_INIT_ARRAY: + case SHT_FINI_ARRAY: + case SHT_PREINIT_ARRAY: + if (section->sh_type < SHT_LOOS && section->sh_link != 0) + warn (_("[%2u]: Unexpected value (%u) in link field.\n"), + i, section->sh_link); + break; + + default: + /* FIXME: Add support for target specific section types. */ +#if 0 /* Currently we do not check other section types as there are too + many special cases. Stab sections for example have a type + of SHT_PROGBITS but an sh_link field that links to the .stabstr + section. */ + if (section->sh_type < SHT_LOOS && section->sh_link != 0) + warn (_("[%2u]: Unexpected value (%u) in link field.\n"), + i, section->sh_link); +#endif + break; } - else + + /* Check the sh_info field. */ + switch (section->sh_type) { - print_symbol (-17, SECTION_NAME (section)); + case SHT_REL: + case SHT_RELA: + if (section->sh_info < 1 + || section->sh_info >= elf_header.e_shnum + || (section_headers[section->sh_info].sh_type != SHT_PROGBITS + && section_headers[section->sh_info].sh_type != SHT_NOBITS + && section_headers[section->sh_info].sh_type != SHT_NOTE + && section_headers[section->sh_info].sh_type != SHT_INIT_ARRAY + /* FIXME: Are other section types valid ? */ + && section_headers[section->sh_info].sh_type < SHT_LOOS)) + { + if (section->sh_info == 0 + && (streq (SECTION_NAME (section), ".rel.dyn") + || streq (SECTION_NAME (section), ".rela.dyn"))) + /* The .rel.dyn and .rela.dyn sections have an sh_info field + of zero. The relocations in these sections may apply + to many different sections. */ + ; + else + warn (_("[%2u]: Info field (%u) should index a relocatable section.\n"), + i, section->sh_info); + } + break; + + case SHT_DYNAMIC: + case SHT_HASH: + case SHT_SYMTAB_SHNDX: + case SHT_INIT_ARRAY: + case SHT_FINI_ARRAY: + case SHT_PREINIT_ARRAY: + if (section->sh_info != 0) + warn (_("[%2u]: Unexpected value (%u) in info field.\n"), + i, section->sh_info); + break; + + case SHT_GROUP: + case SHT_SYMTAB: + case SHT_DYNSYM: + /* A symbol index - we assume that it is valid. */ + break; + + default: + /* FIXME: Add support for target specific section types. */ + if (section->sh_type == SHT_NOBITS) + /* NOBITS section headers with non-zero sh_info fields can be + created when a binary is stripped of everything but its debug + information. The stripped sections have their headers + preserved but their types set to SHT_NOBITS. So do not check + this type of section. */ + ; + else if (section->sh_flags & SHF_INFO_LINK) + { + if (section->sh_info < 1 || section->sh_info >= elf_header.e_shnum) + warn (_("[%2u]: Expected link to another section in info field"), i); + } + else if (section->sh_type < SHT_LOOS + && (section->sh_flags & SHF_GNU_MBIND) == 0 + && section->sh_info != 0) + warn (_("[%2u]: Unexpected value (%u) in info field.\n"), + i, section->sh_info); + break; } - + + /* Check the sh_size field. */ + if (section->sh_size > current_file_size + && section->sh_type != SHT_NOBITS + && section->sh_type != SHT_NULL + && section->sh_type < SHT_LOOS) + warn (_("Size of section %u is larger than the entire file!\n"), i); + + printf (" [%2u] ", i); + if (do_section_details) + printf ("%s\n ", printable_section_name (section)); + else + print_symbol (-17, SECTION_NAME (section)); + printf (do_wide ? " %-15s " : " %-15.15s ", get_section_type_name (section->sh_type)); - + if (is_32bit_elf) { const char * link_too_big = NULL; @@ -5037,7 +6275,7 @@ process_section_headers (FILE * file) switch (elf_header.e_machine) { case EM_386: - case EM_486: + case EM_IAMCU: case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -5163,48 +6401,88 @@ process_section_headers (FILE * file) } if (do_section_details) - printf (" %s\n", get_elf_section_flags (section->sh_flags)); - } + { + printf (" %s\n", get_elf_section_flags (section->sh_flags)); + if ((section->sh_flags & SHF_COMPRESSED) != 0) + { + /* Minimum section size is 12 bytes for 32-bit compression + header + 12 bytes for compressed data header. */ + unsigned char buf[24]; - if (!do_section_details) - { - if (elf_header.e_machine == EM_X86_64 + assert (sizeof (buf) >= sizeof (Elf64_External_Chdr)); + if (get_data (&buf, (FILE *) file, section->sh_offset, 1, + sizeof (buf), _("compression header"))) + { + Elf_Internal_Chdr chdr; + + (void) get_compression_header (&chdr, buf, sizeof (buf)); + + if (chdr.ch_type == ELFCOMPRESS_ZLIB) + printf (" ZLIB, "); + else + printf (_(" [: 0x%x], "), + chdr.ch_type); + print_vma (chdr.ch_size, LONG_HEX); + printf (", %lu\n", (unsigned long) chdr.ch_addralign); + } + } + } + } + + if (!do_section_details) + { + /* The ordering of the letters shown here matches the ordering of the + corresponding SHF_xxx values, and hence the order in which these + letters will be displayed to the user. */ + printf (_("Key to Flags:\n\ + W (write), A (alloc), X (execute), M (merge), S (strings), I (info),\n\ + L (link order), O (extra OS processing required), G (group), T (TLS),\n\ + C (compressed), x (unknown), o (OS specific), E (exclude),\n ")); + if (elf_header.e_machine == EM_X86_64 || elf_header.e_machine == EM_L1OM || elf_header.e_machine == EM_K1OM) - printf (_("Key to Flags:\n\ - W (write), A (alloc), X (execute), M (merge), S (strings), l (large)\n\ - I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown)\n\ - O (extra OS processing required) o (OS specific), p (processor specific)\n")); - else - printf (_("Key to Flags:\n\ - W (write), A (alloc), X (execute), M (merge), S (strings)\n\ - I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown)\n\ - O (extra OS processing required) o (OS specific), p (processor specific)\n")); - } + printf (_("l (large), ")); + else if (elf_header.e_machine == EM_ARM) + printf (_("y (purecode), ")); + printf ("p (processor specific)\n"); + } - return 1; + return TRUE; } static const char * get_group_flags (unsigned int flags) { - static char buff[32]; - switch (flags) - { - case 0: - return ""; + static char buff[128]; + + if (flags == 0) + return ""; + else if (flags == GRP_COMDAT) + return "COMDAT "; - case GRP_COMDAT: - return "COMDAT "; + snprintf (buff, 14, _("[0x%x: "), flags); - default: - snprintf (buff, sizeof (buff), _("[: 0x%x] "), flags); - break; + flags &= ~ GRP_COMDAT; + if (flags & GRP_MASKOS) + { + strcat (buff, ""); + flags &= ~ GRP_MASKOS; + } + + if (flags & GRP_MASKPROC) + { + strcat (buff, ""); + flags &= ~ GRP_MASKPROC; } + + if (flags) + strcat (buff, ""); + + strcat (buff, "]"); return buff; } -static int +static bfd_boolean process_section_groups (FILE * file) { Elf_Internal_Shdr * section; @@ -5219,21 +6497,21 @@ process_section_groups (FILE * file) /* Don't process section groups unless needed. */ if (!do_unwind && !do_section_groups) - return 1; + return TRUE; if (elf_header.e_shnum == 0) { if (do_section_groups) printf (_("\nThere are no sections to group in this file.\n")); - return 1; + return TRUE; } if (section_headers == NULL) { error (_("Section headers are not available!\n")); /* PR 13622: This can happen with a corrupt ELF header. */ - return 0; + return FALSE; } section_headers_groups = (struct group **) calloc (elf_header.e_shnum, @@ -5241,8 +6519,9 @@ process_section_groups (FILE * file) if (section_headers_groups == NULL) { - error (_("Out of memory\n")); - return 0; + error (_("Out of memory reading %u section group headers\n"), + elf_header.e_shnum); + return FALSE; } /* Scan the sections for the group section. */ @@ -5258,15 +6537,16 @@ process_section_groups (FILE * file) if (do_section_groups) printf (_("\nThere are no section groups in this file.\n")); - return 1; + return TRUE; } section_groups = (struct group *) calloc (group_count, sizeof (struct group)); if (section_groups == NULL) { - error (_("Out of memory\n")); - return 0; + error (_("Out of memory reading %lu groups\n"), + (unsigned long) group_count); + return FALSE; } symtab_sec = NULL; @@ -5281,8 +6561,8 @@ process_section_groups (FILE * file) { if (section->sh_type == SHT_GROUP) { - char * name = SECTION_NAME (section); - char * group_name; + const char * name = printable_section_name (section); + const char * group_name; unsigned char * start; unsigned char * indices; unsigned int entry, j, size; @@ -5353,15 +6633,26 @@ process_section_groups (FILE * file) strtab_sec = sec; if (strtab) free (strtab); + strtab = (char *) get_data (NULL, file, strtab_sec->sh_offset, - 1, strtab_sec->sh_size, - _("string table")); + 1, strtab_sec->sh_size, + _("string table")); strtab_size = strtab != NULL ? strtab_sec->sh_size : 0; } group_name = sym->st_name < strtab_size ? strtab + sym->st_name : _(""); } + /* PR 17531: file: loop. */ + if (section->sh_entsize > section->sh_size) + { + error (_("Section %s has sh_entsize (0x%lx) which is larger than its size (0x%lx)\n"), + printable_section_name (section), + (unsigned long) section->sh_entsize, + (unsigned long) section->sh_size); + break; + } + start = (unsigned char *) get_data (NULL, file, section->sh_offset, 1, section->sh_size, _("section data")); @@ -5392,8 +6683,15 @@ process_section_groups (FILE * file) if (entry >= elf_header.e_shnum) { - error (_("section [%5u] in group section [%5u] > maximum section [%5u]\n"), - entry, i, elf_header.e_shnum - 1); + static unsigned num_group_errors = 0; + + if (num_group_errors ++ < 10) + { + error (_("section [%5u] in group section [%5u] > maximum section [%5u]\n"), + entry, i, elf_header.e_shnum - 1); + if (num_group_errors == 10) + warn (_("Futher error messages about overlarge group section indicies suppressed\n")); + } continue; } @@ -5401,22 +6699,29 @@ process_section_groups (FILE * file) { if (entry) { - error (_("section [%5u] in group section [%5u] already in group section [%5u]\n"), - entry, i, - section_headers_groups [entry]->group_index); + static unsigned num_errs = 0; + + if (num_errs ++ < 10) + { + error (_("section [%5u] in group section [%5u] already in group section [%5u]\n"), + entry, i, + section_headers_groups [entry]->group_index); + if (num_errs == 10) + warn (_("Further error messages about already contained group sections suppressed\n")); + } continue; } else { /* Intel C/C++ compiler may put section 0 in a - section group. We just warn it the first time + section group. We just warn it the first time and ignore it afterwards. */ - static int warned = 0; + static bfd_boolean warned = FALSE; if (!warned) { error (_("section 0 in group section [%5u]\n"), section_headers_groups [entry]->group_index); - warned++; + warned = TRUE; } } } @@ -5426,7 +6731,7 @@ process_section_groups (FILE * file) if (do_section_groups) { sec = section_headers + entry; - printf (" [%5u] %s\n", entry, SECTION_NAME (sec)); + printf (" [%5u] %s\n", entry, printable_section_name (sec)); } g = (struct group_list *) xmalloc (sizeof (struct group_list)); @@ -5446,7 +6751,7 @@ process_section_groups (FILE * file) free (symtab); if (strtab) free (strtab); - return 1; + return TRUE; } /* Data used to display dynamic fixups. */ @@ -5471,25 +6776,27 @@ struct ia64_vms_dynimgrela /* Display IA-64 OpenVMS dynamic fixups (used to dynamically link a shared library). */ -static void -dump_ia64_vms_dynamic_fixups (FILE *file, struct ia64_vms_dynfixup *fixup, - const char *strtab, unsigned int strtab_sz) +static bfd_boolean +dump_ia64_vms_dynamic_fixups (FILE * file, + struct ia64_vms_dynfixup * fixup, + const char * strtab, + unsigned int strtab_sz) { - Elf64_External_VMS_IMAGE_FIXUP *imfs; + Elf64_External_VMS_IMAGE_FIXUP * imfs; long i; - const char *lib_name; + const char * lib_name; imfs = get_data (NULL, file, dynamic_addr + fixup->fixup_rela_off, 1, fixup->fixup_rela_cnt * sizeof (*imfs), _("dynamic section image fixups")); if (!imfs) - return; + return FALSE; if (fixup->needed < strtab_sz) lib_name = strtab + fixup->needed; else { - warn ("corrupt library name index of 0x%lx found in dynamic entry", + warn (_("corrupt library name index of 0x%lx found in dynamic entry"), (unsigned long) fixup->needed); lib_name = "???"; } @@ -5516,11 +6823,12 @@ dump_ia64_vms_dynamic_fixups (FILE *file, struct ia64_vms_dynfixup *fixup, } free (imfs); + return TRUE; } /* Display IA-64 OpenVMS dynamic relocations (used to relocate an image). */ -static void +static bfd_boolean dump_ia64_vms_dynamic_relocs (FILE *file, struct ia64_vms_dynimgrela *imgrela) { Elf64_External_VMS_IMAGE_RELA *imrs; @@ -5530,7 +6838,7 @@ dump_ia64_vms_dynamic_relocs (FILE *file, struct ia64_vms_dynimgrela *imgrela) 1, imgrela->img_rela_cnt * sizeof (*imrs), _("dynamic section image relocations")); if (!imrs) - return; + return FALSE; printf (_("\nImage relocs\n")); printf @@ -5557,20 +6865,21 @@ dump_ia64_vms_dynamic_relocs (FILE *file, struct ia64_vms_dynimgrela *imgrela) } free (imrs); + return TRUE; } /* Display IA-64 OpenVMS dynamic relocations and fixups. */ -static int +static bfd_boolean process_ia64_vms_dynamic_relocs (FILE *file) { struct ia64_vms_dynfixup fixup; struct ia64_vms_dynimgrela imgrela; Elf_Internal_Dyn *entry; - int res = 0; bfd_vma strtab_off = 0; bfd_vma strtab_sz = 0; char *strtab = NULL; + bfd_boolean res = TRUE; memset (&fixup, 0, sizeof (fixup)); memset (&imgrela, 0, sizeof (imgrela)); @@ -5606,17 +6915,16 @@ process_ia64_vms_dynamic_relocs (FILE *file) break; case DT_IA_64_VMS_FIXUP_RELA_OFF: fixup.fixup_rela_off = entry->d_un.d_val; - res++; - dump_ia64_vms_dynamic_fixups (file, &fixup, strtab, strtab_sz); + if (! dump_ia64_vms_dynamic_fixups (file, &fixup, strtab, strtab_sz)) + res = FALSE; break; - case DT_IA_64_VMS_IMG_RELA_CNT: imgrela.img_rela_cnt = entry->d_un.d_val; break; case DT_IA_64_VMS_IMG_RELA_OFF: imgrela.img_rela_off = entry->d_un.d_val; - res++; - dump_ia64_vms_dynamic_relocs (file, &imgrela); + if (! dump_ia64_vms_dynamic_relocs (file, &imgrela)) + res = FALSE; break; default: @@ -5636,33 +6944,33 @@ static struct int reloc; int size; int rela; -} dynamic_relocations [] = +} + dynamic_relocations [] = { - { "REL", DT_REL, DT_RELSZ, FALSE }, - { "RELA", DT_RELA, DT_RELASZ, TRUE }, - { "PLT", DT_JMPREL, DT_PLTRELSZ, UNKNOWN } + { "REL", DT_REL, DT_RELSZ, FALSE }, + { "RELA", DT_RELA, DT_RELASZ, TRUE }, + { "PLT", DT_JMPREL, DT_PLTRELSZ, UNKNOWN } }; /* Process the reloc section. */ -static int +static bfd_boolean process_relocs (FILE * file) { unsigned long rel_size; unsigned long rel_offset; - if (!do_reloc) - return 1; + return TRUE; if (do_using_dynamic) { - int is_rela; + int is_rela; const char * name; - int has_dynamic_reloc; + bfd_boolean has_dynamic_reloc; unsigned int i; - has_dynamic_reloc = 0; + has_dynamic_reloc = FALSE; for (i = 0; i < ARRAY_SIZE (dynamic_relocations); i++) { @@ -5671,7 +6979,8 @@ process_relocs (FILE * file) rel_size = dynamic_info [dynamic_relocations [i].size]; rel_offset = dynamic_info [dynamic_relocations [i].reloc]; - has_dynamic_reloc |= rel_size; + if (rel_size) + has_dynamic_reloc = TRUE; if (is_rela == UNKNOWN) { @@ -5697,12 +7006,14 @@ process_relocs (FILE * file) offset_from_vma (file, rel_offset, rel_size), rel_size, dynamic_symbols, num_dynamic_syms, - dynamic_strings, dynamic_strings_length, is_rela); + dynamic_strings, dynamic_strings_length, + is_rela, TRUE /* is_dynamic */); } } if (is_ia64_vms ()) - has_dynamic_reloc |= process_ia64_vms_dynamic_relocs (file); + if (process_ia64_vms_dynamic_relocs (file)) + has_dynamic_reloc = TRUE; if (! has_dynamic_reloc) printf (_("\nThere are no dynamic relocations in this file.\n")); @@ -5711,7 +7022,7 @@ process_relocs (FILE * file) { Elf_Internal_Shdr * section; unsigned long i; - int found = 0; + bfd_boolean found = FALSE; for (i = 0, section = section_headers; i < elf_header.e_shnum; @@ -5734,7 +7045,7 @@ process_relocs (FILE * file) if (string_table == NULL) printf ("%d", section->sh_name); else - printf ("'%s'", SECTION_NAME (section)); + printf ("'%s'", printable_section_name (section)); printf (_(" at offset 0x%lx contains %lu entries:\n"), rel_offset, (unsigned long) (rel_size / section->sh_entsize)); @@ -5766,22 +7077,25 @@ process_relocs (FILE * file) strsec = section_headers + symsec->sh_link; strtab = (char *) get_data (NULL, file, strsec->sh_offset, - 1, strsec->sh_size, - _("string table")); + 1, strsec->sh_size, + _("string table")); strtablen = strtab == NULL ? 0 : strsec->sh_size; } dump_relocations (file, rel_offset, rel_size, - symtab, nsyms, strtab, strtablen, is_rela); + symtab, nsyms, strtab, strtablen, + is_rela, + symsec->sh_type == SHT_DYNSYM); if (strtab) free (strtab); free (symtab); } else dump_relocations (file, rel_offset, rel_size, - NULL, 0, NULL, 0, is_rela); + NULL, 0, NULL, 0, is_rela, + FALSE /* is_dynamic */); - found = 1; + found = TRUE; } } @@ -5789,74 +7103,56 @@ process_relocs (FILE * file) printf (_("\nThere are no relocations in this file.\n")); } - return 1; + return TRUE; } -/* Process the unwind section. */ - -#include "unwind-ia64.h" - /* An absolute address consists of a section and an offset. If the section is NULL, the offset itself is the address, otherwise, the address equals to LOAD_ADDRESS(section) + offset. */ struct absaddr - { - unsigned short section; - bfd_vma offset; - }; +{ + unsigned short section; + bfd_vma offset; +}; #define ABSADDR(a) \ ((a).section \ ? section_headers [(a).section].sh_addr + (a).offset \ : (a).offset) -struct ia64_unw_table_entry - { - struct absaddr start; - struct absaddr end; - struct absaddr info; - }; - -struct ia64_unw_aux_info - { - - struct ia64_unw_table_entry *table; /* Unwind table. */ - unsigned long table_len; /* Length of unwind table. */ - unsigned char * info; /* Unwind info. */ - unsigned long info_size; /* Size of unwind info. */ - bfd_vma info_addr; /* starting address of unwind info. */ - bfd_vma seg_base; /* Starting address of segment. */ - Elf_Internal_Sym * symtab; /* The symbol table. */ - unsigned long nsyms; /* Number of symbols. */ - char * strtab; /* The string table. */ - unsigned long strtab_size; /* Size of string table. */ - }; +/* Find the nearest symbol at or below ADDR. Returns the symbol + name, if found, and the offset from the symbol to ADDR. */ static void find_symbol_for_address (Elf_Internal_Sym * symtab, - unsigned long nsyms, - const char * strtab, - unsigned long strtab_size, - struct absaddr addr, - const char ** symname, - bfd_vma * offset) + unsigned long nsyms, + const char * strtab, + unsigned long strtab_size, + struct absaddr addr, + const char ** symname, + bfd_vma * offset) { bfd_vma dist = 0x100000; Elf_Internal_Sym * sym; + Elf_Internal_Sym * beg; + Elf_Internal_Sym * end; Elf_Internal_Sym * best = NULL; - unsigned long i; REMOVE_ARCH_BITS (addr.offset); + beg = symtab; + end = symtab + nsyms; - for (i = 0, sym = symtab; i < nsyms; ++i, ++sym) + while (beg < end) { - bfd_vma value = sym->st_value; + bfd_vma value; + + sym = beg + (end - beg) / 2; + value = sym->st_value; REMOVE_ARCH_BITS (value); - if (ELF_ST_TYPE (sym->st_info) == STT_FUNC - && sym->st_name != 0 + if (sym->st_name != 0 && (addr.section == SHN_UNDEF || addr.section == sym->st_shndx) && addr.offset >= value && addr.offset - value < dist) @@ -5866,6 +7162,11 @@ find_symbol_for_address (Elf_Internal_Sym * symtab, if (!dist) break; } + + if (addr.offset < value) + end = sym; + else + beg = sym + 1; } if (best) @@ -5880,11 +7181,56 @@ find_symbol_for_address (Elf_Internal_Sym * symtab, *offset = addr.offset; } -static void +static /* signed */ int +symcmp (const void *p, const void *q) +{ + Elf_Internal_Sym *sp = (Elf_Internal_Sym *) p; + Elf_Internal_Sym *sq = (Elf_Internal_Sym *) q; + + return sp->st_value > sq->st_value ? 1 : (sp->st_value < sq->st_value ? -1 : 0); +} + +/* Process the unwind section. */ + +#include "unwind-ia64.h" + +struct ia64_unw_table_entry +{ + struct absaddr start; + struct absaddr end; + struct absaddr info; +}; + +struct ia64_unw_aux_info +{ + struct ia64_unw_table_entry * table; /* Unwind table. */ + unsigned long table_len; /* Length of unwind table. */ + unsigned char * info; /* Unwind info. */ + unsigned long info_size; /* Size of unwind info. */ + bfd_vma info_addr; /* Starting address of unwind info. */ + bfd_vma seg_base; /* Starting address of segment. */ + Elf_Internal_Sym * symtab; /* The symbol table. */ + unsigned long nsyms; /* Number of symbols. */ + Elf_Internal_Sym * funtab; /* Sorted table of STT_FUNC symbols. */ + unsigned long nfuns; /* Number of entries in funtab. */ + char * strtab; /* The string table. */ + unsigned long strtab_size; /* Size of string table. */ +}; + +static bfd_boolean dump_ia64_unwind (struct ia64_unw_aux_info * aux) { struct ia64_unw_table_entry * tp; + unsigned long j, nfuns; int in_body; + bfd_boolean res = TRUE; + + aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym)); + for (nfuns = 0, j = 0; j < aux->nsyms; j++) + if (aux->symtab[j].st_value && ELF_ST_TYPE (aux->symtab[j].st_info) == STT_FUNC) + aux->funtab[nfuns++] = aux->symtab[j]; + aux->nfuns = nfuns; + qsort (aux->funtab, aux->nfuns, sizeof (Elf_Internal_Sym), symcmp); for (tp = aux->table; tp < aux->table + aux->table_len; ++tp) { @@ -5892,9 +7238,10 @@ dump_ia64_unwind (struct ia64_unw_aux_info * aux) bfd_vma offset; const unsigned char * dp; const unsigned char * head; + const unsigned char * end; const char * procname; - find_symbol_for_address (aux->symtab, aux->nsyms, aux->strtab, + find_symbol_for_address (aux->funtab, aux->nfuns, aux->strtab, aux->strtab_size, tp->start, &procname, &offset); fputs ("\n<", stdout); @@ -5914,6 +7261,19 @@ dump_ia64_unwind (struct ia64_unw_aux_info * aux) printf ("], info at +0x%lx\n", (unsigned long) (tp->info.offset - aux->seg_base)); + /* PR 17531: file: 86232b32. */ + if (aux->info == NULL) + continue; + + /* PR 17531: file: 0997b4d1. */ + if ((ABSADDR (tp->info) - aux->info_addr) >= aux->info_size) + { + warn (_("Invalid offset %lx in table entry %ld\n"), + (long) tp->info.offset, (long) (tp - aux->table)); + res = FALSE; + continue; + } + head = aux->info + (ABSADDR (tp->info) - aux->info_addr); stamp = byte_get ((unsigned char *) head, sizeof (stamp)); @@ -5931,12 +7291,20 @@ dump_ia64_unwind (struct ia64_unw_aux_info * aux) } in_body = 0; - for (dp = head + 8; dp < head + 8 + eh_addr_size * UNW_LENGTH (stamp);) - dp = unw_decode (dp, in_body, & in_body); + end = head + 8 + eh_addr_size * UNW_LENGTH (stamp); + /* PR 17531: file: 16ceda89. */ + if (end > aux->info + aux->info_size) + end = aux->info + aux->info_size; + for (dp = head + 8; dp < end;) + dp = unw_decode (dp, in_body, & in_body, end); } + + free (aux->funtab); + + return res; } -static int +static bfd_boolean slurp_ia64_unwind_table (FILE * file, struct ia64_unw_aux_info * aux, Elf_Internal_Shdr * sec) @@ -5952,13 +7320,15 @@ slurp_ia64_unwind_table (FILE * file, Elf_Internal_Sym * sym; const char * relname; + aux->table_len = 0; + /* First, find the starting address of the segment that includes this section: */ if (elf_header.e_phnum) { if (! get_program_headers (file)) - return 0; + return FALSE; for (seg = program_headers; seg < program_headers + elf_header.e_phnum; @@ -5981,12 +7351,14 @@ slurp_ia64_unwind_table (FILE * file, table = (unsigned char *) get_data (NULL, file, sec->sh_offset, 1, size, _("unwind table")); if (!table) - return 0; + return FALSE; + aux->table_len = size / (3 * eh_addr_size); aux->table = (struct ia64_unw_table_entry *) - xcmalloc (size / (3 * eh_addr_size), sizeof (aux->table[0])); + xcmalloc (aux->table_len, sizeof (aux->table[0])); tep = aux->table; - for (tp = table; tp < table + size; ++tep) + + for (tp = table; tp <= table + size - (3 * eh_addr_size); ++tep) { tep->start.section = SHN_UNDEF; tep->end.section = SHN_UNDEF; @@ -6012,22 +7384,41 @@ slurp_ia64_unwind_table (FILE * file, if (!slurp_rela_relocs (file, relsec->sh_offset, relsec->sh_size, & rela, & nrelas)) - return 0; + { + free (aux->table); + aux->table = NULL; + aux->table_len = 0; + return FALSE; + } for (rp = rela; rp < rela + nrelas; ++rp) { relname = elf_ia64_reloc_type (get_reloc_type (rp->r_info)); sym = aux->symtab + get_reloc_symindex (rp->r_info); + /* PR 17531: file: 9fa67536. */ + if (relname == NULL) + { + warn (_("Skipping unknown relocation type: %u\n"), get_reloc_type (rp->r_info)); + continue; + } + if (! const_strneq (relname, "R_IA64_SEGREL")) { - warn (_("Skipping unexpected relocation type %s\n"), relname); + warn (_("Skipping unexpected relocation type: %s\n"), relname); continue; } i = rp->r_offset / (3 * eh_addr_size); - switch (rp->r_offset/eh_addr_size % 3) + /* PR 17531: file: 5bc8d9bf. */ + if (i >= aux->table_len) + { + warn (_("Skipping reloc with overlarge offset: %lx\n"), i); + continue; + } + + switch (rp->r_offset / eh_addr_size % 3) { case 0: aux->table[i].start.section = sym->st_shndx; @@ -6049,11 +7440,10 @@ slurp_ia64_unwind_table (FILE * file, free (rela); } - aux->table_len = size / (3 * eh_addr_size); - return 1; + return TRUE; } -static void +static bfd_boolean ia64_process_unwind (FILE * file) { Elf_Internal_Shdr * sec; @@ -6061,6 +7451,7 @@ ia64_process_unwind (FILE * file) Elf_Internal_Shdr * strsec; unsigned long i, unwcount = 0, unwstart = 0; struct ia64_unw_aux_info aux; + bfd_boolean res = TRUE; memset (& aux, 0, sizeof (aux)); @@ -6072,7 +7463,12 @@ ia64_process_unwind (FILE * file) aux.symtab = GET_ELF_SYMBOLS (file, sec, & aux.nsyms); strsec = section_headers + sec->sh_link; - assert (aux.strtab == NULL); + if (aux.strtab != NULL) + { + error (_("Multiple auxillary string tables encountered\n")); + free (aux.strtab); + res = FALSE; + } aux.strtab = (char *) get_data (NULL, file, strsec->sh_offset, 1, strsec->sh_size, _("string table")); @@ -6090,13 +7486,16 @@ ia64_process_unwind (FILE * file) char * suffix; size_t len, len2; - for (i = unwstart, sec = section_headers + unwstart; + for (i = unwstart, sec = section_headers + unwstart, unwsec = NULL; i < elf_header.e_shnum; ++i, ++sec) if (sec->sh_type == SHT_IA_64_UNWIND) { unwsec = sec; break; } + /* We have already counted the number of SHT_IA64_UNWIND + sections so the loop above should never fail. */ + assert (unwsec != NULL); unwstart = i + 1; len = sizeof (ELF_STRING_ia64_unwind_once) - 1; @@ -6104,18 +7503,26 @@ ia64_process_unwind (FILE * file) if ((unwsec->sh_flags & SHF_GROUP) != 0) { /* We need to find which section group it is in. */ - struct group_list * g = section_headers_groups [i]->root; + struct group_list * g; - for (; g != NULL; g = g->next) + if (section_headers_groups == NULL + || section_headers_groups [i] == NULL) + i = elf_header.e_shnum; + else { - sec = section_headers + g->section_index; + g = section_headers_groups [i]->root; - if (streq (SECTION_NAME (sec), ELF_STRING_ia64_unwind_info)) - break; - } + for (; g != NULL; g = g->next) + { + sec = section_headers + g->section_index; - if (g == NULL) - i = elf_header.e_shnum; + if (streq (SECTION_NAME (sec), ELF_STRING_ia64_unwind_info)) + break; + } + + if (g == NULL) + i = elf_header.e_shnum; + } } else if (strneq (SECTION_NAME (unwsec), ELF_STRING_ia64_unwind_once, len)) { @@ -6151,14 +7558,14 @@ ia64_process_unwind (FILE * file) if (string_table == NULL) printf ("%d", unwsec->sh_name); else - printf (_("'%s'"), SECTION_NAME (unwsec)); + printf ("'%s'", printable_section_name (unwsec)); } else { aux.info_addr = sec->sh_addr; aux.info = (unsigned char *) get_data (NULL, file, sec->sh_offset, 1, - sec->sh_size, - _("unwind info")); + sec->sh_size, + _("unwind info")); aux.info_size = aux.info == NULL ? 0 : sec->sh_size; printf (_("\nUnwind section ")); @@ -6166,15 +7573,14 @@ ia64_process_unwind (FILE * file) if (string_table == NULL) printf ("%d", unwsec->sh_name); else - printf (_("'%s'"), SECTION_NAME (unwsec)); + printf ("'%s'", printable_section_name (unwsec)); printf (_(" at offset 0x%lx contains %lu entries:\n"), (unsigned long) unwsec->sh_offset, (unsigned long) (unwsec->sh_size / (3 * eh_addr_size))); - (void) slurp_ia64_unwind_table (file, & aux, unwsec); - - if (aux.table_len > 0) + if (slurp_ia64_unwind_table (file, & aux, unwsec) + && aux.table_len > 0) dump_ia64_unwind (& aux); if (aux.table) @@ -6190,67 +7596,80 @@ ia64_process_unwind (FILE * file) free (aux.symtab); if (aux.strtab) free ((char *) aux.strtab); + + return res; } struct hppa_unw_table_entry - { - struct absaddr start; - struct absaddr end; - unsigned int Cannot_unwind:1; /* 0 */ - unsigned int Millicode:1; /* 1 */ - unsigned int Millicode_save_sr0:1; /* 2 */ - unsigned int Region_description:2; /* 3..4 */ - unsigned int reserved1:1; /* 5 */ - unsigned int Entry_SR:1; /* 6 */ - unsigned int Entry_FR:4; /* number saved */ /* 7..10 */ - unsigned int Entry_GR:5; /* number saved */ /* 11..15 */ - unsigned int Args_stored:1; /* 16 */ - unsigned int Variable_Frame:1; /* 17 */ - unsigned int Separate_Package_Body:1; /* 18 */ - unsigned int Frame_Extension_Millicode:1; /* 19 */ - unsigned int Stack_Overflow_Check:1; /* 20 */ - unsigned int Two_Instruction_SP_Increment:1; /* 21 */ - unsigned int Ada_Region:1; /* 22 */ - unsigned int cxx_info:1; /* 23 */ - unsigned int cxx_try_catch:1; /* 24 */ - unsigned int sched_entry_seq:1; /* 25 */ - unsigned int reserved2:1; /* 26 */ - unsigned int Save_SP:1; /* 27 */ - unsigned int Save_RP:1; /* 28 */ - unsigned int Save_MRP_in_frame:1; /* 29 */ - unsigned int extn_ptr_defined:1; /* 30 */ - unsigned int Cleanup_defined:1; /* 31 */ - - unsigned int MPE_XL_interrupt_marker:1; /* 0 */ - unsigned int HP_UX_interrupt_marker:1; /* 1 */ - unsigned int Large_frame:1; /* 2 */ - unsigned int Pseudo_SP_Set:1; /* 3 */ - unsigned int reserved4:1; /* 4 */ - unsigned int Total_frame_size:27; /* 5..31 */ - }; +{ + struct absaddr start; + struct absaddr end; + unsigned int Cannot_unwind:1; /* 0 */ + unsigned int Millicode:1; /* 1 */ + unsigned int Millicode_save_sr0:1; /* 2 */ + unsigned int Region_description:2; /* 3..4 */ + unsigned int reserved1:1; /* 5 */ + unsigned int Entry_SR:1; /* 6 */ + unsigned int Entry_FR:4; /* Number saved 7..10 */ + unsigned int Entry_GR:5; /* Number saved 11..15 */ + unsigned int Args_stored:1; /* 16 */ + unsigned int Variable_Frame:1; /* 17 */ + unsigned int Separate_Package_Body:1; /* 18 */ + unsigned int Frame_Extension_Millicode:1; /* 19 */ + unsigned int Stack_Overflow_Check:1; /* 20 */ + unsigned int Two_Instruction_SP_Increment:1; /* 21 */ + unsigned int Ada_Region:1; /* 22 */ + unsigned int cxx_info:1; /* 23 */ + unsigned int cxx_try_catch:1; /* 24 */ + unsigned int sched_entry_seq:1; /* 25 */ + unsigned int reserved2:1; /* 26 */ + unsigned int Save_SP:1; /* 27 */ + unsigned int Save_RP:1; /* 28 */ + unsigned int Save_MRP_in_frame:1; /* 29 */ + unsigned int extn_ptr_defined:1; /* 30 */ + unsigned int Cleanup_defined:1; /* 31 */ + + unsigned int MPE_XL_interrupt_marker:1; /* 0 */ + unsigned int HP_UX_interrupt_marker:1; /* 1 */ + unsigned int Large_frame:1; /* 2 */ + unsigned int Pseudo_SP_Set:1; /* 3 */ + unsigned int reserved4:1; /* 4 */ + unsigned int Total_frame_size:27; /* 5..31 */ +}; struct hppa_unw_aux_info - { - struct hppa_unw_table_entry *table; /* Unwind table. */ - unsigned long table_len; /* Length of unwind table. */ - bfd_vma seg_base; /* Starting address of segment. */ - Elf_Internal_Sym * symtab; /* The symbol table. */ - unsigned long nsyms; /* Number of symbols. */ - char * strtab; /* The string table. */ - unsigned long strtab_size; /* Size of string table. */ - }; +{ + struct hppa_unw_table_entry * table; /* Unwind table. */ + unsigned long table_len; /* Length of unwind table. */ + bfd_vma seg_base; /* Starting address of segment. */ + Elf_Internal_Sym * symtab; /* The symbol table. */ + unsigned long nsyms; /* Number of symbols. */ + Elf_Internal_Sym * funtab; /* Sorted table of STT_FUNC symbols. */ + unsigned long nfuns; /* Number of entries in funtab. */ + char * strtab; /* The string table. */ + unsigned long strtab_size; /* Size of string table. */ +}; -static void +static bfd_boolean dump_hppa_unwind (struct hppa_unw_aux_info * aux) { struct hppa_unw_table_entry * tp; + unsigned long j, nfuns; + bfd_boolean res = TRUE; + + aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym)); + for (nfuns = 0, j = 0; j < aux->nsyms; j++) + if (aux->symtab[j].st_value && ELF_ST_TYPE (aux->symtab[j].st_info) == STT_FUNC) + aux->funtab[nfuns++] = aux->symtab[j]; + aux->nfuns = nfuns; + qsort (aux->funtab, aux->nfuns, sizeof (Elf_Internal_Sym), symcmp); for (tp = aux->table; tp < aux->table + aux->table_len; ++tp) { bfd_vma offset; const char * procname; - find_symbol_for_address (aux->symtab, aux->nsyms, aux->strtab, + find_symbol_for_address (aux->funtab, aux->nfuns, aux->strtab, aux->strtab_size, tp->start, &procname, &offset); @@ -6304,9 +7723,13 @@ dump_hppa_unwind (struct hppa_unw_aux_info * aux) } printf ("\n"); + + free (aux->funtab); + + return res; } -static int +static bfd_boolean slurp_hppa_unwind_table (FILE * file, struct hppa_unw_aux_info * aux, Elf_Internal_Shdr * sec) @@ -6324,11 +7747,10 @@ slurp_hppa_unwind_table (FILE * file, /* First, find the starting address of the segment that includes this section. */ - if (elf_header.e_phnum) { if (! get_program_headers (file)) - return 0; + return FALSE; for (seg = program_headers; seg < program_headers + elf_header.e_phnum; @@ -6352,7 +7774,7 @@ slurp_hppa_unwind_table (FILE * file, table = (unsigned char *) get_data (NULL, file, sec->sh_offset, 1, size, _("unwind table")); if (!table) - return 0; + return FALSE; unw_ent_size = 16; nentries = size / unw_ent_size; @@ -6422,7 +7844,7 @@ slurp_hppa_unwind_table (FILE * file, if (!slurp_rela_relocs (file, relsec->sh_offset, relsec->sh_size, & rela, & nrelas)) - return 0; + return FALSE; for (rp = rela; rp < rela + nrelas; ++rp) { @@ -6458,10 +7880,10 @@ slurp_hppa_unwind_table (FILE * file, aux->table_len = nentries; - return 1; + return TRUE; } -static void +static bfd_boolean hppa_process_unwind (FILE * file) { struct hppa_unw_aux_info aux; @@ -6469,9 +7891,10 @@ hppa_process_unwind (FILE * file) Elf_Internal_Shdr * strsec; Elf_Internal_Shdr * sec; unsigned long i; + bfd_boolean res = TRUE; if (string_table == NULL) - return; + return FALSE; memset (& aux, 0, sizeof (aux)); @@ -6483,7 +7906,12 @@ hppa_process_unwind (FILE * file) aux.symtab = GET_ELF_SYMBOLS (file, sec, & aux.nsyms); strsec = section_headers + sec->sh_link; - assert (aux.strtab == NULL); + if (aux.strtab != NULL) + { + error (_("Multiple auxillary string tables encountered\n")); + free (aux.strtab); + res = FALSE; + } aux.strtab = (char *) get_data (NULL, file, strsec->sh_offset, 1, strsec->sh_size, _("string table")); @@ -6500,16 +7928,19 @@ hppa_process_unwind (FILE * file) { if (streq (SECTION_NAME (sec), ".PARISC.unwind")) { - printf (_("\nUnwind section ")); - printf (_("'%s'"), SECTION_NAME (sec)); - - printf (_(" at offset 0x%lx contains %lu entries:\n"), + printf (_("\nUnwind section '%s' at offset 0x%lx contains %lu entries:\n"), + printable_section_name (sec), (unsigned long) sec->sh_offset, (unsigned long) (sec->sh_size / (2 * eh_addr_size + 8))); - slurp_hppa_unwind_table (file, &aux, sec); + if (! slurp_hppa_unwind_table (file, &aux, sec)) + res = FALSE; + if (aux.table_len > 0) - dump_hppa_unwind (&aux); + { + if (! dump_hppa_unwind (&aux)) + res = FALSE; + } if (aux.table) free ((char *) aux.table); @@ -6521,6 +7952,8 @@ hppa_process_unwind (FILE * file) free (aux.symtab); if (aux.strtab) free ((char *) aux.strtab); + + return res; } struct arm_section @@ -6538,6 +7971,8 @@ struct arm_unw_aux_info FILE * file; /* The file containing the unwind sections. */ Elf_Internal_Sym * symtab; /* The file's symbol table. */ unsigned long nsyms; /* Number of symbols. */ + Elf_Internal_Sym * funtab; /* Sorted table of STT_FUNC symbols. */ + unsigned long nfuns; /* Number of these symbols. */ char * strtab; /* The file's string table. */ unsigned long strtab_size; /* Size of string table. */ }; @@ -6552,7 +7987,7 @@ arm_print_vma_and_name (struct arm_unw_aux_info *aux, if (addr.section == SHN_UNDEF) addr.offset = fn; - find_symbol_for_address (aux->symtab, aux->nsyms, aux->strtab, + find_symbol_for_address (aux->funtab, aux->nfuns, aux->strtab, aux->strtab_size, addr, &procname, &sym_offset); @@ -6607,6 +8042,9 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, unsigned int word; bfd_boolean wrapped; + if (sec == NULL || arm_sec == NULL) + return FALSE; + addr->section = SHN_UNDEF; addr->offset = 0; @@ -6662,9 +8100,23 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, if (arm_sec->data == NULL) return FALSE; + /* If the offset is invalid then fail. */ + if (/* PR 21343 *//* PR 18879 */ + sec->sh_size < 4 + || word_offset > (sec->sh_size - 4) + || ((bfd_signed_vma) word_offset) < 0) + return FALSE; + /* Get the word at the required offset. */ word = byte_get (arm_sec->data + word_offset, 4); + /* PR 17531: file: id:000001,src:001266+003044,op:splice,rep:128. */ + if (arm_sec->rela == NULL) + { + * wordp = word; + return TRUE; + } + /* Look through the relocs to find the one that applies to the provided offset. */ wrapped = FALSE; for (rp = arm_sec->next_rela; rp != arm_sec->rela + arm_sec->nrelas; rp++) @@ -6689,7 +8141,9 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, if (rp->r_offset < word_offset) continue; - sym = aux->symtab + ELF32_R_SYM (rp->r_info); + /* PR 17531: file: 027-161405-0.004 */ + if (aux->symtab == NULL) + continue; if (arm_sec->rel_type == SHT_REL) { @@ -6700,8 +8154,21 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, else if (arm_sec->rel_type == SHT_RELA) offset = rp->r_addend; else - abort (); + { + error (_("Unknown section relocation type %d encountered\n"), + arm_sec->rel_type); + break; + } + + /* PR 17531 file: 027-1241568-0.004. */ + if (ELF32_R_SYM (rp->r_info) >= aux->nsyms) + { + error (_("Bad symbol index in unwind relocation (%lu > %lu)\n"), + (unsigned long) ELF32_R_SYM (rp->r_info), aux->nsyms); + break; + } + sym = aux->symtab + ELF32_R_SYM (rp->r_info); offset += sym->st_value; prelval = offset - (arm_sec->sec->sh_addr + rp->r_offset); @@ -6709,38 +8176,54 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, if (elf_header.e_machine == EM_ARM) { relname = elf_arm_reloc_type (ELF32_R_TYPE (rp->r_info)); + if (relname == NULL) + { + warn (_("Skipping unknown ARM relocation type: %d\n"), + (int) ELF32_R_TYPE (rp->r_info)); + continue; + } if (streq (relname, "R_ARM_NONE")) continue; - + if (! streq (relname, "R_ARM_PREL31")) { - warn (_("Skipping unexpected relocation type %s\n"), relname); + warn (_("Skipping unexpected ARM relocation type %s\n"), relname); continue; } } else if (elf_header.e_machine == EM_TI_C6000) { relname = elf_tic6x_reloc_type (ELF32_R_TYPE (rp->r_info)); - + if (relname == NULL) + { + warn (_("Skipping unknown C6000 relocation type: %d\n"), + (int) ELF32_R_TYPE (rp->r_info)); + continue; + } + if (streq (relname, "R_C6000_NONE")) continue; if (! streq (relname, "R_C6000_PREL31")) { - warn (_("Skipping unexpected relocation type %s\n"), relname); + warn (_("Skipping unexpected C6000 relocation type %s\n"), relname); continue; } prelval >>= 1; } else - /* This function currently only supports ARM and TI unwinders. */ - abort (); + { + /* This function currently only supports ARM and TI unwinders. */ + warn (_("Only TI and ARM unwinders are currently supported\n")); + break; + } word = (word & ~ (bfd_vma) 0x7fffffff) | (prelval & 0x7fffffff); addr->section = sym->st_shndx; addr->offset = offset; + if (sym_name) * sym_name = sym->st_name; break; @@ -6754,8 +8237,8 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, static const char *tic6x_unwind_regnames[16] = { - "A15", "B15", "B14", "B13", "B12", "B11", "B10", "B3", - "A14", "A13", "A12", "A11", "A10", + "A15", "B15", "B14", "B13", "B12", "B11", "B10", "B3", + "A14", "A13", "A12", "A11", "A10", "[invalid reg 13]", "[invalid reg 14]", "[invalid reg 15]" }; @@ -6781,7 +8264,7 @@ decode_tic6x_unwind_regmask (unsigned int mask) data_offset += 4; \ if (! get_unwind_section_word (aux, data_arm_sec, data_sec, \ data_offset, & word, & addr, NULL)) \ - return; \ + return FALSE; \ remaining = 4; \ more_words--; \ } \ @@ -6797,18 +8280,21 @@ decode_tic6x_unwind_regmask (unsigned int mask) else \ { \ printf (_("[Truncated opcode]\n")); \ - return; \ + return FALSE; \ } \ printf ("0x%02x ", OP) -static void -decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, - unsigned int word, unsigned int remaining, - unsigned int more_words, - bfd_vma data_offset, Elf_Internal_Shdr *data_sec, - struct arm_section *data_arm_sec) +static bfd_boolean +decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, + unsigned int word, + unsigned int remaining, + unsigned int more_words, + bfd_vma data_offset, + Elf_Internal_Shdr * data_sec, + struct arm_section * data_arm_sec) { struct absaddr addr; + bfd_boolean res = TRUE; /* Decode the unwinding instructions. */ while (1) @@ -6844,7 +8330,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, else { unsigned int mask = ((op & 0x0f) << 8) | op2; - int first = 1; + bfd_boolean first = TRUE; int i; printf ("pop {"); @@ -6852,7 +8338,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, if (mask & (1 << i)) { if (first) - first = 0; + first = FALSE; else printf (", "); printf ("r%d", 4 + i); @@ -6870,14 +8356,14 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, else if ((op & 0xf0) == 0xa0) { int end = 4 + (op & 0x07); - int first = 1; + bfd_boolean first = TRUE; int i; printf (" pop {"); for (i = 4; i <= end; i++) { if (first) - first = 0; + first = FALSE; else printf (", "); printf ("r%d", i); @@ -6900,7 +8386,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, else { unsigned int mask = op2 & 0x0f; - int first = 1; + bfd_boolean first = TRUE; int i; printf ("pop {"); @@ -6908,7 +8394,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, if (mask & (1 << i)) { if (first) - first = 0; + first = FALSE; else printf (", "); printf ("r%d", i); @@ -6928,11 +8414,18 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, if ((buf[i] & 0x80) == 0) break; } - assert (i < sizeof (buf)); - offset = read_uleb128 (buf, &len, buf + i + 1); - assert (len == i + 1); - offset = offset * 4 + 0x204; - printf ("vsp = vsp + %ld", offset); + if (i == sizeof (buf)) + { + error (_("corrupt change to vsp")); + res = FALSE; + } + else + { + offset = read_uleb128 (buf, &len, buf + i + 1); + assert (len == i + 1); + offset = offset * 4 + 0x204; + printf ("vsp = vsp + %ld", offset); + } } else if (op == 0xb3 || op == 0xc8 || op == 0xc9) { @@ -6986,7 +8479,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, else { unsigned int mask = op2 & 0x0f; - int first = 1; + bfd_boolean first = TRUE; int i; printf ("pop {"); @@ -6994,7 +8487,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, if (mask & (1 << i)) { if (first) - first = 0; + first = FALSE; else printf (", "); printf ("wCGR%d", i); @@ -7003,17 +8496,25 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info *aux, } } else - printf (_(" [unsupported opcode]")); + { + printf (_(" [unsupported opcode]")); + res = FALSE; + } + printf ("\n"); } + + return res; } -static void -decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux, - unsigned int word, unsigned int remaining, - unsigned int more_words, - bfd_vma data_offset, Elf_Internal_Shdr *data_sec, - struct arm_section *data_arm_sec) +static bfd_boolean +decode_tic6x_unwind_bytecode (struct arm_unw_aux_info * aux, + unsigned int word, + unsigned int remaining, + unsigned int more_words, + bfd_vma data_offset, + Elf_Internal_Shdr * data_sec, + struct arm_section * data_arm_sec) { struct absaddr addr; @@ -7061,8 +8562,8 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux, const char *name; struct { - unsigned int offset; - unsigned int reg; + unsigned int offset; + unsigned int reg; } regpos[16]; /* Scan entire instruction first so that GET_OP output is not @@ -7124,7 +8625,13 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux, if ((buf[i] & 0x80) == 0) break; } - assert (i < sizeof (buf)); + /* PR 17531: file: id:000001,src:001906+004739,op:splice,rep:2. */ + if (i == sizeof (buf)) + { + warn (_("Corrupt stack pointer adjustment detected\n")); + return FALSE; + } + offset = read_uleb128 (buf, &len, buf + i + 1); assert (len == i + 1); offset = offset * 8 + 0x408; @@ -7143,6 +8650,8 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info *aux, } putchar ('\n'); } + + return TRUE; } static bfd_vma @@ -7160,7 +8669,7 @@ arm_expand_prel31 (bfd_vma word, bfd_vma where) return offset + where; } -static void +static bfd_boolean decode_arm_unwind (struct arm_unw_aux_info * aux, unsigned int word, unsigned int remaining, @@ -7172,6 +8681,7 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, unsigned int more_words = 0; struct absaddr addr; bfd_vma sym_name = (bfd_vma) -1; + bfd_boolean res = FALSE; if (remaining == 0) { @@ -7182,7 +8692,7 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, the personality routine. */ if (! get_unwind_section_word (aux, data_arm_sec, data_sec, data_offset, & word, & addr, & sym_name)) - return; + return FALSE; remaining = 4; } @@ -7227,7 +8737,7 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, if (!remaining) { printf (_(" [Truncated data]\n")); - return; + return FALSE; } more_words = word >> 24; word <<= 8; @@ -7235,21 +8745,24 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, per_index = -1; } else - return; + return TRUE; } else { /* ARM EHABI Section 6.3: - + An exception-handling table entry for the compact model looks like: - + 31 30-28 27-24 23-0 -- ----- ----- ---- 1 0 index Data for personalityRoutine[index] */ if (elf_header.e_machine == EM_ARM && (word & 0x70000000)) - warn (_("Corrupt ARM compact model table entry: %x \n"), word); + { + warn (_("Corrupt ARM compact model table entry: %x \n"), word); + res = FALSE; + } per_index = (word >> 24) & 0x7f; printf (_(" Compact model index: %d\n"), per_index); @@ -7272,21 +8785,24 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, case EM_ARM: if (per_index < 3) { - decode_arm_unwind_bytecode (aux, word, remaining, more_words, - data_offset, data_sec, data_arm_sec); + if (! decode_arm_unwind_bytecode (aux, word, remaining, more_words, + data_offset, data_sec, data_arm_sec)) + res = FALSE; } else { warn (_("Unknown ARM compact model index encountered\n")); printf (_(" [reserved]\n")); + res = FALSE; } break; case EM_TI_C6000: if (per_index < 3) { - decode_tic6x_unwind_bytecode (aux, word, remaining, more_words, - data_offset, data_sec, data_arm_sec); + if (! decode_tic6x_unwind_bytecode (aux, word, remaining, more_words, + data_offset, data_sec, data_arm_sec)) + res = FALSE; } else if (per_index < 5) { @@ -7307,23 +8823,35 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, break; default: - error (_("Unsupported architecture type %d encountered when decoding unwind table"), + error (_("Unsupported architecture type %d encountered when decoding unwind table\n"), elf_header.e_machine); + res = FALSE; } /* Decode the descriptors. Not implemented. */ + + return res; } -static void +static bfd_boolean dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) { struct arm_section exidx_arm_sec, extab_arm_sec; unsigned int i, exidx_len; + unsigned long j, nfuns; + bfd_boolean res = TRUE; memset (&exidx_arm_sec, 0, sizeof (exidx_arm_sec)); memset (&extab_arm_sec, 0, sizeof (extab_arm_sec)); exidx_len = exidx_sec->sh_size / 8; + aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym)); + for (nfuns = 0, j = 0; j < aux->nsyms; j++) + if (aux->symtab[j].st_value && ELF_ST_TYPE (aux->symtab[j].st_info) == STT_FUNC) + aux->funtab[nfuns++] = aux->symtab[j]; + aux->nfuns = nfuns; + qsort (aux->funtab, aux->nfuns, sizeof (Elf_Internal_Sym), symcmp); + for (i = 0; i < exidx_len; i++) { unsigned int exidx_fn, exidx_entry; @@ -7337,16 +8865,20 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) || ! get_unwind_section_word (aux, & exidx_arm_sec, exidx_sec, 8 * i + 4, & exidx_entry, & entry_addr, NULL)) { + free (aux->funtab); arm_free_section (& exidx_arm_sec); arm_free_section (& extab_arm_sec); - return; + return FALSE; } /* ARM EHABI, Section 5: An index table entry consists of 2 words. The first word contains a prel31 offset to the start of a function, with bit 31 clear. */ if (exidx_fn & 0x80000000) - warn (_("corrupt index table entry: %x\n"), exidx_fn); + { + warn (_("corrupt index table entry: %x\n"), exidx_fn); + res = FALSE; + } fn = arm_expand_prel31 (exidx_fn, exidx_sec->sh_addr + 8 * i); @@ -7380,6 +8912,16 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) { table_sec = section_headers + entry_addr.section; table_offset = entry_addr.offset; + /* PR 18879 */ + if (table_offset > table_sec->sh_size + || ((bfd_signed_vma) table_offset) < 0) + { + warn (_("Unwind entry contains corrupt offset (0x%lx) into section %s\n"), + (unsigned long) table_offset, + printable_section_name (table_sec)); + res = FALSE; + continue; + } } else { @@ -7387,26 +8929,33 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) if (table_sec != NULL) table_offset = table - table_sec->sh_addr; } + if (table_sec == NULL) { warn (_("Could not locate .ARM.extab section containing 0x%lx.\n"), (unsigned long) table); + res = FALSE; continue; } - decode_arm_unwind (aux, 0, 0, table_offset, table_sec, - &extab_arm_sec); + + if (! decode_arm_unwind (aux, 0, 0, table_offset, table_sec, + &extab_arm_sec)) + res = FALSE; } } printf ("\n"); + free (aux->funtab); arm_free_section (&exidx_arm_sec); arm_free_section (&extab_arm_sec); + + return res; } /* Used for both ARM and C6X unwinding tables. */ -static void +static bfd_boolean arm_process_unwind (FILE *file) { struct arm_unw_aux_info aux; @@ -7415,6 +8964,7 @@ arm_process_unwind (FILE *file) Elf_Internal_Shdr *sec; unsigned long i; unsigned int sec_type; + bfd_boolean res = TRUE; switch (elf_header.e_machine) { @@ -7426,14 +8976,14 @@ arm_process_unwind (FILE *file) sec_type = SHT_C6000_UNWIND; break; - default: - error (_("Unsupported architecture type %d encountered when processing unwind table"), + default: + error (_("Unsupported architecture type %d encountered when processing unwind table\n"), elf_header.e_machine); - return; + return FALSE; } if (string_table == NULL) - return; + return FALSE; memset (& aux, 0, sizeof (aux)); aux.file = file; @@ -7445,7 +8995,14 @@ arm_process_unwind (FILE *file) aux.symtab = GET_ELF_SYMBOLS (file, sec, & aux.nsyms); strsec = section_headers + sec->sh_link; - assert (aux.strtab == NULL); + + /* PR binutils/17531 file: 011-12666-0.004. */ + if (aux.strtab != NULL) + { + error (_("Multiple string tables found in file.\n")); + free (aux.strtab); + res = FALSE; + } aux.strtab = get_data (NULL, file, strsec->sh_offset, 1, strsec->sh_size, _("string table")); aux.strtab_size = aux.strtab != NULL ? strsec->sh_size : 0; @@ -7462,11 +9019,12 @@ arm_process_unwind (FILE *file) if (sec->sh_type == sec_type) { printf (_("\nUnwind table index '%s' at offset 0x%lx contains %lu entries:\n"), - SECTION_NAME (sec), + printable_section_name (sec), (unsigned long) sec->sh_offset, (unsigned long) (sec->sh_size / (2 * eh_addr_size))); - dump_arm_unwind (&aux, sec); + if (! dump_arm_unwind (&aux, sec)) + res = FALSE; } } @@ -7474,37 +9032,37 @@ arm_process_unwind (FILE *file) free (aux.symtab); if (aux.strtab) free ((char *) aux.strtab); + + return res; } -static void +static bfd_boolean process_unwind (FILE * file) { struct unwind_handler { - int machtype; - void (* handler)(FILE *); + unsigned int machtype; + bfd_boolean (* handler)(FILE *); } handlers[] = { { EM_ARM, arm_process_unwind }, { EM_IA_64, ia64_process_unwind }, { EM_PARISC, hppa_process_unwind }, { EM_TI_C6000, arm_process_unwind }, - { 0, 0 } + { 0, NULL } }; int i; if (!do_unwind) - return; + return TRUE; for (i = 0; handlers[i].handler != NULL; i++) if (elf_header.e_machine == handlers[i].machtype) - { - handlers[i].handler (file); - return; - } + return handlers[i].handler (file); printf (_("\nThe decoding of unwind sections for machine type %s is not currently supported.\n"), get_machine_name (elf_header.e_machine)); + return TRUE; } static void @@ -7526,13 +9084,13 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry) "RLD_ORDER_SAFE" }; unsigned int cnt; - int first = 1; + bfd_boolean first = TRUE; for (cnt = 0; cnt < ARRAY_SIZE (opts); ++cnt) if (entry->d_un.d_val & (1 << cnt)) { printf ("%s%s", first ? "" : " ", opts[cnt]); - first = 0; + first = FALSE; } } break; @@ -7541,19 +9099,28 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry) if (VALID_DYNAMIC_NAME (entry->d_un.d_val)) printf (_("Interface Version: %s"), GET_DYNAMIC_NAME (entry->d_un.d_val)); else - printf (_(""), entry->d_un.d_ptr); + { + char buf[40]; + sprintf_vma (buf, entry->d_un.d_ptr); + /* Note: coded this way so that there is a single string for translation. */ + printf (_(""), buf); + } break; case DT_MIPS_TIME_STAMP: { - char timebuf[20]; + char timebuf[128]; struct tm * tmp; - time_t atime = entry->d_un.d_val; + tmp = gmtime (&atime); - snprintf (timebuf, sizeof (timebuf), "%04u-%02u-%02uT%02u:%02u:%02u", - tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday, - tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + /* PR 17531: file: 6accc532. */ + if (tmp == NULL) + snprintf (timebuf, sizeof (timebuf), _("")); + else + snprintf (timebuf, sizeof (timebuf), "%04u-%02u-%02uT%02u:%02u:%02u", + tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); printf (_("Time Stamp: %s"), timebuf); } break; @@ -7571,7 +9138,7 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry) case DT_MIPS_DELTA_SYM_NO: case DT_MIPS_DELTA_CLASSSYM_NO: case DT_MIPS_COMPACT_SIZE: - print_vma (entry->d_un.d_ptr, DEC); + print_vma (entry->d_un.d_val, DEC); break; default: @@ -7612,7 +9179,7 @@ dynamic_section_parisc_val (Elf_Internal_Dyn * entry) { DT_HP_GROUP, "HP_GROUP" }, { DT_HP_PROTECT_LINKAGE_TABLE, "HP_PROTECT_LINKAGE_TABLE" } }; - int first = 1; + bfd_boolean first = TRUE; size_t cnt; bfd_vma val = entry->d_un.d_val; @@ -7622,7 +9189,7 @@ dynamic_section_parisc_val (Elf_Internal_Dyn * entry) if (! first) putchar (' '); fputs (flags[cnt].str, stdout); - first = 0; + first = FALSE; val ^= flags[cnt].bit; } @@ -7724,7 +9291,7 @@ dynamic_section_ia64_val (Elf_Internal_Dyn * entry) putchar ('\n'); } -static int +static bfd_boolean get_32bit_dynamic_section (FILE * file) { Elf32_External_Dyn * edyn; @@ -7734,13 +9301,13 @@ get_32bit_dynamic_section (FILE * file) edyn = (Elf32_External_Dyn *) get_data (NULL, file, dynamic_addr, 1, dynamic_size, _("dynamic section")); if (!edyn) - return 0; + return FALSE; -/* SGI's ELF has more than one section in the DYNAMIC segment, and we - might not have the luxury of section headers. Look for the DT_NULL - terminator to determine the number of entries. */ + /* SGI's ELF has more than one section in the DYNAMIC segment, and we + might not have the luxury of section headers. Look for the DT_NULL + terminator to determine the number of entries. */ for (ext = edyn, dynamic_nent = 0; - (char *) ext < (char *) edyn + dynamic_size; + (char *) (ext + 1) <= (char *) edyn + dynamic_size; ext++) { dynamic_nent++; @@ -7752,9 +9319,10 @@ get_32bit_dynamic_section (FILE * file) sizeof (* entry)); if (dynamic_section == NULL) { - error (_("Out of memory\n")); + error (_("Out of memory allocating space for %lu dynamic entries\n"), + (unsigned long) dynamic_nent); free (edyn); - return 0; + return FALSE; } for (ext = edyn, entry = dynamic_section; @@ -7767,26 +9335,28 @@ get_32bit_dynamic_section (FILE * file) free (edyn); - return 1; + return TRUE; } -static int +static bfd_boolean get_64bit_dynamic_section (FILE * file) { Elf64_External_Dyn * edyn; Elf64_External_Dyn * ext; Elf_Internal_Dyn * entry; + /* Read in the data. */ edyn = (Elf64_External_Dyn *) get_data (NULL, file, dynamic_addr, 1, dynamic_size, _("dynamic section")); if (!edyn) - return 0; + return FALSE; -/* SGI's ELF has more than one section in the DYNAMIC segment, and we - might not have the luxury of section headers. Look for the DT_NULL - terminator to determine the number of entries. */ + /* SGI's ELF has more than one section in the DYNAMIC segment, and we + might not have the luxury of section headers. Look for the DT_NULL + terminator to determine the number of entries. */ for (ext = edyn, dynamic_nent = 0; - (char *) ext < (char *) edyn + dynamic_size; + /* PR 17533 file: 033-67080-0.004 - do not read past end of buffer. */ + (char *) (ext + 1) <= (char *) edyn + dynamic_size; ext++) { dynamic_nent++; @@ -7798,11 +9368,13 @@ get_64bit_dynamic_section (FILE * file) sizeof (* entry)); if (dynamic_section == NULL) { - error (_("Out of memory\n")); + error (_("Out of memory allocating space for %lu dynamic entries\n"), + (unsigned long) dynamic_nent); free (edyn); - return 0; + return FALSE; } + /* Convert from external to internal formats. */ for (ext = edyn, entry = dynamic_section; entry < dynamic_section + dynamic_nent; ext++, entry++) @@ -7813,13 +9385,13 @@ get_64bit_dynamic_section (FILE * file) free (edyn); - return 1; + return TRUE; } static void print_dynamic_flags (bfd_vma flags) { - int first = 1; + bfd_boolean first = TRUE; while (flags) { @@ -7829,7 +9401,7 @@ print_dynamic_flags (bfd_vma flags) flags &= ~ flag; if (first) - first = 0; + first = FALSE; else putc (' ', stdout); @@ -7848,7 +9420,7 @@ print_dynamic_flags (bfd_vma flags) /* Parse and display the contents of the dynamic section. */ -static int +static bfd_boolean process_dynamic_section (FILE * file) { Elf_Internal_Dyn * entry; @@ -7858,16 +9430,19 @@ process_dynamic_section (FILE * file) if (do_dynamic) printf (_("\nThere is no dynamic section in this file.\n")); - return 1; + return TRUE; } if (is_32bit_elf) { if (! get_32bit_dynamic_section (file)) - return 0; + return FALSE; + } + else + { + if (! get_64bit_dynamic_section (file)) + return FALSE; } - else if (! get_64bit_dynamic_section (file)) - return 0; /* Find the appropriate symbol table. */ if (dynamic_symbols == NULL) @@ -7888,6 +9463,12 @@ process_dynamic_section (FILE * file) processing that. This is overkill, I know, but it should work. */ section.sh_offset = offset_from_vma (file, entry->d_un.d_val, 0); + if ((bfd_size_type) section.sh_offset > current_file_size) + { + /* See PR 21379 for a reproducer. */ + error (_("Invalid DT_SYMTAB entry: %lx"), (long) section.sh_offset); + return FALSE; + } if (archive_file_offset != 0) section.sh_size = archive_file_size - section.sh_offset; @@ -7903,6 +9484,7 @@ process_dynamic_section (FILE * file) section.sh_entsize = sizeof (Elf32_External_Sym); else section.sh_entsize = sizeof (Elf64_External_Sym); + section.sh_name = string_table_length; dynamic_symbols = GET_ELF_SYMBOLS (file, §ion, & num_dynamic_syms); if (num_dynamic_syms < 1) @@ -7972,7 +9554,11 @@ process_dynamic_section (FILE * file) { /* Note: these braces are necessary to avoid a syntax error from the SunOS4 C compiler. */ - assert (sizeof (Elf_External_Syminfo) == entry->d_un.d_val); + /* PR binutils/17531: A corrupt file can trigger this test. + So do not use an assert, instead generate an error message. */ + if (sizeof (Elf_External_Syminfo) != entry->d_un.d_val) + error (_("Bad value (%d) for SYMINENT entry\n"), + (int) entry->d_un.d_val); } else if (entry->d_tag == DT_SYMINSZ) syminsz = entry->d_un.d_val; @@ -7992,13 +9578,14 @@ process_dynamic_section (FILE * file) get_data (NULL, file, dynamic_syminfo_offset, 1, syminsz, _("symbol information")); if (!extsyminfo) - return 0; + return FALSE; dynamic_syminfo = (Elf_Internal_Syminfo *) malloc (syminsz); if (dynamic_syminfo == NULL) { - error (_("Out of memory\n")); - return 0; + error (_("Out of memory allocating %lu byte for dynamic symbol info\n"), + (unsigned long) syminsz); + return FALSE; } dynamic_syminfo_nent = syminsz / sizeof (Elf_External_Syminfo); @@ -8015,8 +9602,8 @@ process_dynamic_section (FILE * file) } if (do_dynamic && dynamic_addr) - printf (_("\nDynamic section at offset 0x%lx contains %u entries:\n"), - dynamic_addr, dynamic_nent); + printf (_("\nDynamic section at offset 0x%lx contains %lu entries:\n"), + dynamic_addr, (unsigned long) dynamic_nent); if (do_dynamic) printf (_(" Tag Type Name/Value\n")); @@ -8032,9 +9619,7 @@ process_dynamic_section (FILE * file) print_vma (entry->d_tag, FULL_HEX); dtype = get_dynamic_type (entry->d_tag); printf (" (%s)%*s", dtype, - ((is_32bit_elf ? 27 : 19) - - (int) strlen (dtype)), - " "); + ((is_32bit_elf ? 27 : 19) - (int) strlen (dtype)), " "); } switch (entry->d_tag) @@ -8281,6 +9866,16 @@ process_dynamic_section (FILE * file) printf (" SINGLETON"); val ^= DF_1_SINGLETON; } + if (val & DF_1_STUB) + { + printf (" STUB"); + val ^= DF_1_STUB; + } + if (val & DF_1_PIE) + { + printf (" PIE"); + val ^= DF_1_PIE; + } if (val != 0) printf (" %lx", val); puts (""); @@ -8365,6 +9960,7 @@ process_dynamic_section (FILE * file) case DT_SYMENT : case DT_RELENT : dynamic_info[entry->d_tag] = entry->d_un.d_val; + /* Fall through. */ case DT_PLTPADSZ: case DT_MOVEENT : case DT_MOVESZ : @@ -8428,9 +10024,14 @@ process_dynamic_section (FILE * file) time_t atime = entry->d_un.d_val; tmp = gmtime (&atime); - printf ("%04u-%02u-%02uT%02u:%02u:%02u\n", - tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday, - tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + /* PR 17533 file: 041-1244816-0.004. */ + if (tmp == NULL) + printf (_("tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); } break; @@ -8472,7 +10073,7 @@ process_dynamic_section (FILE * file) } } - return 1; + return TRUE; } static char * @@ -8486,41 +10087,46 @@ get_ver_flags (unsigned int flags) return _("none"); if (flags & VER_FLG_BASE) - strcat (buff, "BASE "); + strcat (buff, "BASE"); if (flags & VER_FLG_WEAK) { if (flags & VER_FLG_BASE) - strcat (buff, "| "); + strcat (buff, " | "); - strcat (buff, "WEAK "); + strcat (buff, "WEAK"); } if (flags & VER_FLG_INFO) { if (flags & (VER_FLG_BASE|VER_FLG_WEAK)) - strcat (buff, "| "); + strcat (buff, " | "); - strcat (buff, "INFO "); + strcat (buff, "INFO"); } if (flags & ~(VER_FLG_BASE | VER_FLG_WEAK | VER_FLG_INFO)) - strcat (buff, _("| ")); + { + if (flags & (VER_FLG_BASE | VER_FLG_WEAK | VER_FLG_INFO)) + strcat (buff, " | "); + + strcat (buff, _("")); + } return buff; } /* Display the contents of the version sections. */ -static int +static bfd_boolean process_version_sections (FILE * file) { Elf_Internal_Shdr * section; unsigned i; - int found = 0; + bfd_boolean found = FALSE; if (! do_version) - return 1; + return TRUE; for (i = 0, section = section_headers; i < elf_header.e_shnum; @@ -8533,21 +10139,20 @@ process_version_sections (FILE * file) Elf_External_Verdef * edefs; unsigned int idx; unsigned int cnt; + unsigned int end; char * endbuf; - found = 1; + found = TRUE; - printf - (_("\nVersion definition section '%s' contains %u entries:\n"), - SECTION_NAME (section), section->sh_info); + printf (_("\nVersion definition section '%s' contains %u entries:\n"), + printable_section_name (section), + section->sh_info); printf (_(" Addr: 0x")); printf_vma (section->sh_addr); printf (_(" Offset: %#08lx Link: %u (%s)\n"), (unsigned long) section->sh_offset, section->sh_link, - section->sh_link < elf_header.e_shnum - ? SECTION_NAME (section_headers + section->sh_link) - : _("")); + printable_section_name_from_index (section->sh_link)); edefs = (Elf_External_Verdef *) get_data (NULL, file, section->sh_offset, 1,section->sh_size, @@ -8556,17 +10161,20 @@ process_version_sections (FILE * file) break; endbuf = (char *) edefs + section->sh_size; - for (idx = cnt = 0; cnt < section->sh_info; ++cnt) + /* PR 17531: file: id:000001,src:000172+005151,op:splice,rep:2. */ + end = (section->sh_info < section->sh_size + ? section->sh_info : section->sh_size); + for (idx = cnt = 0; cnt < end; ++cnt) { char * vstart; Elf_External_Verdef * edef; Elf_Internal_Verdef ent; Elf_External_Verdaux * eaux; Elf_Internal_Verdaux aux; + unsigned int isum; int j; - int isum; - /* Check for very large indicies. */ + /* Check for very large indices. */ if (idx > (size_t) (endbuf - (char *) edefs)) break; @@ -8590,8 +10198,9 @@ process_version_sections (FILE * file) printf (_(" Index: %d Cnt: %d "), ent.vd_ndx, ent.vd_cnt); - /* Check for overflow. */ - if (ent.vd_aux > (size_t) (endbuf - vstart)) + /* Check for overflow and underflow. */ + if (ent.vd_aux + sizeof (* eaux) > (size_t) (endbuf - vstart) + || (vstart + ent.vd_aux < vstart)) break; vstart += ent.vd_aux; @@ -8635,6 +10244,11 @@ process_version_sections (FILE * file) if (j < ent.vd_cnt) printf (_(" Version def aux past end of section\n")); + /* PR 17531: + file: id:000001,src:000172+005151,op:splice,rep:2. */ + if (idx + ent.vd_next < idx) + break; + idx += ent.vd_next; } @@ -8652,18 +10266,16 @@ process_version_sections (FILE * file) unsigned int cnt; char * endbuf; - found = 1; + found = TRUE; printf (_("\nVersion needs section '%s' contains %u entries:\n"), - SECTION_NAME (section), section->sh_info); + printable_section_name (section), section->sh_info); printf (_(" Addr: 0x")); printf_vma (section->sh_addr); printf (_(" Offset: %#08lx Link: %u (%s)\n"), (unsigned long) section->sh_offset, section->sh_link, - section->sh_link < elf_header.e_shnum - ? SECTION_NAME (section_headers + section->sh_link) - : _("")); + printable_section_name_from_index (section->sh_link)); eneed = (Elf_External_Verneed *) get_data (NULL, file, section->sh_offset, 1, @@ -8677,8 +10289,8 @@ process_version_sections (FILE * file) { Elf_External_Verneed * entry; Elf_Internal_Verneed ent; + unsigned int isum; int j; - int isum; char * vstart; if (idx > (size_t) (endbuf - (char *) eneed)) @@ -8708,7 +10320,6 @@ process_version_sections (FILE * file) /* Check for overflow. */ if (ent.vn_aux > (size_t) (endbuf - vstart)) break; - vstart += ent.vn_aux; for (j = 0, isum = idx + ent.vn_aux; j < ent.vn_cnt; ++j) @@ -8737,9 +10348,14 @@ process_version_sections (FILE * file) get_ver_flags (aux.vna_flags), aux.vna_other); /* Check for overflow. */ - if (aux.vna_next > (size_t) (endbuf - vstart)) - break; - + if (aux.vna_next > (size_t) (endbuf - vstart) + || (aux.vna_next == 0 && j < ent.vn_cnt - 1)) + { + warn (_("Invalid vna_next field of %lx\n"), + aux.vna_next); + j = ent.vn_cnt; + break; + } isum += aux.vna_next; vstart += aux.vna_next; } @@ -8747,6 +10363,12 @@ process_version_sections (FILE * file) if (j < ent.vn_cnt) warn (_("Missing Version Needs auxillary information\n")); + if (ent.vn_next == 0 && cnt < section->sh_info - 1) + { + warn (_("Corrupt Version Needs structure - offset to next structure is zero with entries still left to be processed\n")); + cnt = section->sh_info; + break; + } idx += ent.vn_next; } @@ -8760,8 +10382,8 @@ process_version_sections (FILE * file) case SHT_GNU_versym: { Elf_Internal_Shdr * link_section; - int total; - int cnt; + size_t total; + unsigned int cnt; unsigned char * edata; unsigned short * data; char * strtab; @@ -8779,7 +10401,7 @@ process_version_sections (FILE * file) if (link_section->sh_link >= elf_header.e_shnum) break; - found = 1; + found = TRUE; symbols = GET_ELF_SYMBOLS (file, link_section, & num_syms); if (symbols == NULL) @@ -8796,14 +10418,14 @@ process_version_sections (FILE * file) break; } - printf (_("\nVersion symbols section '%s' contains %d entries:\n"), - SECTION_NAME (section), total); + printf (_("\nVersion symbols section '%s' contains %lu entries:\n"), + printable_section_name (section), (unsigned long) total); printf (_(" Addr: ")); printf_vma (section->sh_addr); printf (_(" Offset: %#08lx Link: %u (%s)\n"), (unsigned long) section->sh_offset, section->sh_link, - SECTION_NAME (link_section)); + printable_section_name (link_section)); off = offset_from_vma (file, version_info[DT_VERSIONTAGIDX (DT_VERSYM)], @@ -8829,8 +10451,8 @@ process_version_sections (FILE * file) for (cnt = 0; cnt < total; cnt += 4) { int j, nn; - int check_def, check_need; - char * name; + char *name; + char *invalid = _("*invalid*"); printf (" %03x:", cnt); @@ -8857,20 +10479,8 @@ process_version_sections (FILE * file) break; } - check_def = 1; - check_need = 1; - if (symbols[cnt + j].st_shndx >= elf_header.e_shnum - || section_headers[symbols[cnt + j].st_shndx].sh_type - != SHT_NOBITS) - { - if (symbols[cnt + j].st_shndx == SHN_UNDEF) - check_def = 0; - else - check_need = 0; - } - - if (check_need - && version_info[DT_VERSIONTAGIDX (DT_VERNEED)]) + name = NULL; + if (version_info[DT_VERSIONTAGIDX (DT_VERNEED)]) { Elf_Internal_Verneed ivn; unsigned long offset; @@ -8889,7 +10499,7 @@ process_version_sections (FILE * file) if (get_data (&evn, file, offset, sizeof (evn), 1, _("version need")) == NULL) break; - + ivn.vn_aux = BYTE_GET (evn.vn_aux); ivn.vn_next = BYTE_GET (evn.vn_next); @@ -8919,14 +10529,9 @@ process_version_sections (FILE * file) ivna.vna_name = BYTE_GET (evna.vna_name); if (ivna.vna_name >= string_sec->sh_size) - name = _("*invalid*"); + name = invalid; else name = strtab + ivna.vna_name; - nn += printf ("(%s%-*s", - name, - 12 - (int) strlen (name), - ")"); - check_def = 0; break; } @@ -8935,7 +10540,7 @@ process_version_sections (FILE * file) while (ivn.vn_next); } - if (check_def && data[cnt + j] != 0x8001 + if (data[cnt + j] != 0x8001 && version_info[DT_VERSIONTAGIDX (DT_VERDEF)]) { Elf_Internal_Verdef ivd; @@ -8952,7 +10557,9 @@ process_version_sections (FILE * file) _("version def")) == NULL) { ivd.vd_next = 0; - ivd.vd_ndx = 0; + /* PR 17531: file: 046-1082287-0.004. */ + ivd.vd_ndx = (data[cnt + j] & VERSYM_VERSION) + 1; + break; } else { @@ -8981,15 +10588,18 @@ process_version_sections (FILE * file) ivda.vda_name = BYTE_GET (evda.vda_name); if (ivda.vda_name >= string_sec->sh_size) - name = _("*invalid*"); + name = invalid; + else if (name != NULL && name != invalid) + name = _("*both*"); else name = strtab + ivda.vda_name; - nn += printf ("(%s%-*s", - name, - 12 - (int) strlen (name), - ")"); } } + if (name != NULL) + nn += printf ("(%s%-*s", + name, + 12 - (int) strlen (name), + ")"); if (nn < 18) printf ("%*c", 18 - nn, ' '); @@ -9012,7 +10622,7 @@ process_version_sections (FILE * file) if (! found) printf (_("\nNo version information found in this file.\n")); - return 1; + return TRUE; } static const char * @@ -9063,13 +10673,8 @@ get_symbol_type (unsigned int type) default: if (type >= STT_LOPROC && type <= STT_HIPROC) { - if (elf_header.e_machine == EM_ARM) - { - if (type == STT_ARM_TFUNC) - return "THUMB_FUNC"; - if (type == STT_ARM_16BIT) - return "THUMB_LABEL"; - } + if (elf_header.e_machine == EM_ARM && type == STT_ARM_TFUNC) + return "THUMB_FUNC"; if (elf_header.e_machine == EM_SPARCV9 && type == STT_REGISTER) return "REGISTER"; @@ -9113,7 +10718,21 @@ get_symbol_visibility (unsigned int visibility) case STV_INTERNAL: return "INTERNAL"; case STV_HIDDEN: return "HIDDEN"; case STV_PROTECTED: return "PROTECTED"; - default: abort (); + default: + error (_("Unrecognized visibility value: %u"), visibility); + return _(""); + } +} + +static const char * +get_solaris_symbol_visibility (unsigned int visibility) +{ + switch (visibility) + { + case 4: return "EXPORTED"; + case 5: return "SINGLETON"; + case 6: return "ELIMINATE"; + default: return get_symbol_visibility (visibility); } } @@ -9122,20 +10741,13 @@ get_mips_symbol_other (unsigned int other) { switch (other) { - case STO_OPTIONAL: - return "OPTIONAL"; - case STO_MIPS_PLT: - return "MIPS PLT"; - case STO_MIPS_PIC: - return "MIPS PIC"; - case STO_MICROMIPS: - return "MICROMIPS"; - case STO_MICROMIPS | STO_MIPS_PIC: - return "MICROMIPS, MIPS PIC"; - case STO_MIPS16: - return "MIPS16"; - default: - return NULL; + case STO_OPTIONAL: return "OPTIONAL"; + case STO_MIPS_PLT: return "MIPS PLT"; + case STO_MIPS_PIC: return "MIPS PIC"; + case STO_MICROMIPS: return "MICROMIPS"; + case STO_MICROMIPS | STO_MIPS_PIC: return "MICROMIPS, MIPS PIC"; + case STO_MIPS16: return "MIPS16"; + default: return NULL; } } @@ -9168,7 +10780,10 @@ get_ia64_symbol_other (unsigned int other) strcat (res, " RSV"); break; default: - abort (); + warn (_("Unrecognized IA64 VMS ST Function type: %d\n"), + VMS_ST_FUNC_TYPE (other)); + strcat (res, " "); + break; } break; default: @@ -9189,7 +10804,10 @@ get_ia64_symbol_other (unsigned int other) strcat (res, " LNK"); break; default: - abort (); + warn (_("Unrecognized IA64 VMS ST Linkage: %d\n"), + VMS_ST_LINKAGE (other)); + strcat (res, " "); + break; } if (res[0] != 0) @@ -9200,6 +10818,19 @@ get_ia64_symbol_other (unsigned int other) return NULL; } +static const char * +get_ppc64_symbol_other (unsigned int other) +{ + if (PPC64_LOCAL_ENTRY_OFFSET (other) != 0) + { + static char buf[32]; + snprintf (buf, sizeof buf, _(": %d"), + PPC64_LOCAL_ENTRY_OFFSET (other)); + return buf; + } + return NULL; +} + static const char * get_symbol_other (unsigned int other) { @@ -9217,7 +10848,11 @@ get_symbol_other (unsigned int other) case EM_IA_64: result = get_ia64_symbol_other (other); break; + case EM_PPC64: + result = get_ppc64_symbol_other (other); + break; default: + result = NULL; break; } @@ -9263,7 +10898,7 @@ get_symbol_index_type (unsigned int type) else if (type >= SHN_LORESERVE) sprintf (buff, "RSV[0x%04x]", type & 0xffff); else if (type >= elf_header.e_shnum) - sprintf (buff, "bad section index[%3d]", type); + sprintf (buff, _("bad section index[%3d]"), type); else sprintf (buff, "%3d", type); break; @@ -9273,30 +10908,54 @@ get_symbol_index_type (unsigned int type) } static bfd_vma * -get_dynamic_data (FILE * file, unsigned int number, unsigned int ent_size) +get_dynamic_data (FILE * file, bfd_size_type number, unsigned int ent_size) { unsigned char * e_data; bfd_vma * i_data; - e_data = (unsigned char *) cmalloc (number, ent_size); + /* If the size_t type is smaller than the bfd_size_type, eg because + you are building a 32-bit tool on a 64-bit host, then make sure + that when (number) is cast to (size_t) no information is lost. */ + if (sizeof (size_t) < sizeof (bfd_size_type) + && (bfd_size_type) ((size_t) number) != number) + { + error (_("Size truncation prevents reading %" BFD_VMA_FMT "u" + " elements of size %u\n"), + number, ent_size); + return NULL; + } - if (e_data == NULL) + /* Be kind to memory chekers (eg valgrind, address sanitizer) by not + attempting to allocate memory when the read is bound to fail. */ + if (ent_size * number > current_file_size) { - error (_("Out of memory\n")); + error (_("Invalid number of dynamic entries: %" BFD_VMA_FMT "u\n"), + number); return NULL; } - if (fread (e_data, ent_size, number, file) != number) + e_data = (unsigned char *) cmalloc ((size_t) number, ent_size); + if (e_data == NULL) { - error (_("Unable to read in dynamic data\n")); + error (_("Out of memory reading %" BFD_VMA_FMT "u dynamic entries\n"), + number); return NULL; } - i_data = (bfd_vma *) cmalloc (number, sizeof (*i_data)); + if (fread (e_data, ent_size, (size_t) number, file) != number) + { + error (_("Unable to read in %" BFD_VMA_FMT "u bytes of dynamic data\n"), + number * ent_size); + free (e_data); + return NULL; + } + i_data = (bfd_vma *) cmalloc ((size_t) number, sizeof (*i_data)); if (i_data == NULL) { - error (_("Out of memory\n")); + error (_("Out of memory allocating space for %" BFD_VMA_FMT "u" + " dynamic entries\n"), + number); free (e_data); return NULL; } @@ -9315,25 +10974,41 @@ print_dynamic_symbol (bfd_vma si, unsigned long hn) Elf_Internal_Sym * psym; int n; - psym = dynamic_symbols + si; - n = print_vma (si, DEC_5); if (n < 5) - fputs (" " + n, stdout); + fputs (&" "[n], stdout); printf (" %3lu: ", hn); + + if (dynamic_symbols == NULL || si >= num_dynamic_syms) + { + printf (_("\n"), + (unsigned long) si); + return; + } + + psym = dynamic_symbols + si; print_vma (psym->st_value, LONG_HEX); putchar (' '); print_vma (psym->st_size, DEC_5); printf (" %-7s", get_symbol_type (ELF_ST_TYPE (psym->st_info))); printf (" %-6s", get_symbol_binding (ELF_ST_BIND (psym->st_info))); - printf (" %-7s", get_symbol_visibility (ELF_ST_VISIBILITY (psym->st_other))); - /* Check to see if any other bits in the st_other field are set. - Note - displaying this information disrupts the layout of the - table being generated, but for the moment this case is very - rare. */ - if (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other)) - printf (" [%s] ", get_symbol_other (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other))); + + if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + printf (" %-7s", get_solaris_symbol_visibility (psym->st_other)); + else + { + unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); + + printf (" %-7s", get_symbol_visibility (vis)); + /* Check to see if any other bits in the st_other field are set. + Note - displaying this information disrupts the layout of the + table being generated, but for the moment this case is very + rare. */ + if (psym->st_other ^ vis) + printf (" [%s] ", get_symbol_other (psym->st_other ^ vis)); + } + printf (" %3.3s ", get_symbol_index_type (psym->st_shndx)); if (VALID_DYNAMIC_NAME (psym->st_name)) print_symbol (25, GET_DYNAMIC_NAME (psym->st_name)); @@ -9342,22 +11017,185 @@ print_dynamic_symbol (bfd_vma si, unsigned long hn) putchar ('\n'); } +static const char * +get_symbol_version_string (FILE * file, + bfd_boolean is_dynsym, + const char * strtab, + unsigned long int strtab_size, + unsigned int si, + Elf_Internal_Sym * psym, + enum versioned_symbol_info * sym_info, + unsigned short * vna_other) +{ + unsigned char data[2]; + unsigned short vers_data; + unsigned long offset; + + if (!is_dynsym + || version_info[DT_VERSIONTAGIDX (DT_VERSYM)] == 0) + return NULL; + + offset = offset_from_vma (file, version_info[DT_VERSIONTAGIDX (DT_VERSYM)], + sizeof data + si * sizeof (vers_data)); + + if (get_data (&data, file, offset + si * sizeof (vers_data), + sizeof (data), 1, _("version data")) == NULL) + return NULL; + + vers_data = byte_get (data, 2); + + if ((vers_data & VERSYM_HIDDEN) == 0 && vers_data <= 1) + return NULL; + + /* Usually we'd only see verdef for defined symbols, and verneed for + undefined symbols. However, symbols defined by the linker in + .dynbss for variables copied from a shared library in order to + avoid text relocations are defined yet have verneed. We could + use a heuristic to detect the special case, for example, check + for verneed first on symbols defined in SHT_NOBITS sections, but + it is simpler and more reliable to just look for both verdef and + verneed. .dynbss might not be mapped to a SHT_NOBITS section. */ + + if (psym->st_shndx != SHN_UNDEF + && vers_data != 0x8001 + && version_info[DT_VERSIONTAGIDX (DT_VERDEF)]) + { + Elf_Internal_Verdef ivd; + Elf_Internal_Verdaux ivda; + Elf_External_Verdaux evda; + unsigned long off; + + off = offset_from_vma (file, + version_info[DT_VERSIONTAGIDX (DT_VERDEF)], + sizeof (Elf_External_Verdef)); + + do + { + Elf_External_Verdef evd; + + if (get_data (&evd, file, off, sizeof (evd), 1, + _("version def")) == NULL) + { + ivd.vd_ndx = 0; + ivd.vd_aux = 0; + ivd.vd_next = 0; + } + else + { + ivd.vd_ndx = BYTE_GET (evd.vd_ndx); + ivd.vd_aux = BYTE_GET (evd.vd_aux); + ivd.vd_next = BYTE_GET (evd.vd_next); + } + + off += ivd.vd_next; + } + while (ivd.vd_ndx != (vers_data & VERSYM_VERSION) && ivd.vd_next != 0); + + if (ivd.vd_ndx == (vers_data & VERSYM_VERSION)) + { + off -= ivd.vd_next; + off += ivd.vd_aux; + + if (get_data (&evda, file, off, sizeof (evda), 1, + _("version def aux")) != NULL) + { + ivda.vda_name = BYTE_GET (evda.vda_name); + + if (psym->st_name != ivda.vda_name) + { + *sym_info = ((vers_data & VERSYM_HIDDEN) != 0 + ? symbol_hidden : symbol_public); + return (ivda.vda_name < strtab_size + ? strtab + ivda.vda_name : _("")); + } + } + } + } + + if (version_info[DT_VERSIONTAGIDX (DT_VERNEED)]) + { + Elf_External_Verneed evn; + Elf_Internal_Verneed ivn; + Elf_Internal_Vernaux ivna; + + offset = offset_from_vma (file, + version_info[DT_VERSIONTAGIDX (DT_VERNEED)], + sizeof evn); + do + { + unsigned long vna_off; + + if (get_data (&evn, file, offset, sizeof (evn), 1, + _("version need")) == NULL) + { + ivna.vna_next = 0; + ivna.vna_other = 0; + ivna.vna_name = 0; + break; + } + + ivn.vn_aux = BYTE_GET (evn.vn_aux); + ivn.vn_next = BYTE_GET (evn.vn_next); + + vna_off = offset + ivn.vn_aux; + + do + { + Elf_External_Vernaux evna; + + if (get_data (&evna, file, vna_off, sizeof (evna), 1, + _("version need aux (3)")) == NULL) + { + ivna.vna_next = 0; + ivna.vna_other = 0; + ivna.vna_name = 0; + } + else + { + ivna.vna_other = BYTE_GET (evna.vna_other); + ivna.vna_next = BYTE_GET (evna.vna_next); + ivna.vna_name = BYTE_GET (evna.vna_name); + } + + vna_off += ivna.vna_next; + } + while (ivna.vna_other != vers_data && ivna.vna_next != 0); + + if (ivna.vna_other == vers_data) + break; + + offset += ivn.vn_next; + } + while (ivn.vn_next != 0); + + if (ivna.vna_other == vers_data) + { + *sym_info = symbol_undefined; + *vna_other = ivna.vna_other; + return (ivna.vna_name < strtab_size + ? strtab + ivna.vna_name : _("")); + } + } + return NULL; +} + /* Dump the symbol table. */ -static int +static bfd_boolean process_symbol_table (FILE * file) { Elf_Internal_Shdr * section; - bfd_vma nbuckets = 0; - bfd_vma nchains = 0; + bfd_size_type nbuckets = 0; + bfd_size_type nchains = 0; bfd_vma * buckets = NULL; bfd_vma * chains = NULL; bfd_vma ngnubuckets = 0; bfd_vma * gnubuckets = NULL; bfd_vma * gnuchains = NULL; bfd_vma gnusymidx = 0; + bfd_size_type ngnuchains = 0; if (!do_syms && !do_dyn_syms && !do_histogram) - return 1; + return TRUE; if (dynamic_info[DT_HASH] && (do_histogram @@ -9367,7 +11205,7 @@ process_symbol_table (FILE * file) { unsigned char nb[8]; unsigned char nc[8]; - int hash_ent_size = 4; + unsigned int hash_ent_size = 4; if ((elf_header.e_machine == EM_ALPHA || elf_header.e_machine == EM_S390 @@ -9407,7 +11245,7 @@ process_symbol_table (FILE * file) if (buckets == NULL || chains == NULL) { if (do_using_dynamic) - return 0; + return FALSE; free (buckets); free (chains); buckets = NULL; @@ -9470,7 +11308,7 @@ process_symbol_table (FILE * file) if (gnubuckets[i] != 0) { if (gnubuckets[i] < gnusymidx) - return 0; + return FALSE; if (maxchain == 0xffffffff || gnubuckets[i] > maxchain) maxchain = gnubuckets[i]; @@ -9516,6 +11354,7 @@ process_symbol_table (FILE * file) } gnuchains = get_dynamic_data (file, maxchain, 4); + ngnuchains = maxchain; no_gnu_hash: if (gnuchains == NULL) @@ -9524,14 +11363,15 @@ process_symbol_table (FILE * file) gnubuckets = NULL; ngnubuckets = 0; if (do_using_dynamic) - return 0; + return FALSE; } } if ((dynamic_info[DT_HASH] || dynamic_info_DT_GNU_HASH) && do_syms && do_using_dynamic - && dynamic_strings != NULL) + && dynamic_strings != NULL + && dynamic_symbols != NULL) { unsigned long hn; @@ -9574,11 +11414,12 @@ process_symbol_table (FILE * file) print_dynamic_symbol (si, hn); si++; } - while ((gnuchains[off++] & 1) == 0); + while (off < ngnuchains && (gnuchains[off++] & 1) == 0); } } } - else if (do_dyn_syms || (do_syms && !do_using_dynamic)) + else if ((do_dyn_syms || (do_syms && !do_using_dynamic)) + && section_headers != NULL) { unsigned int i; @@ -9602,12 +11443,12 @@ process_symbol_table (FILE * file) if (section->sh_entsize == 0) { printf (_("\nSymbol table '%s' has a sh_entsize of zero!\n"), - SECTION_NAME (section)); + printable_section_name (section)); continue; } printf (_("\nSymbol table '%s' contains %lu entries:\n"), - SECTION_NAME (section), + printable_section_name (section), (unsigned long) (section->sh_size / section->sh_entsize)); if (is_32bit_elf) @@ -9638,232 +11479,122 @@ process_symbol_table (FILE * file) for (si = 0, psym = symtab; si < num_syms; si++, psym++) { + const char *version_string; + enum versioned_symbol_info sym_info; + unsigned short vna_other; + printf ("%6d: ", si); print_vma (psym->st_value, LONG_HEX); putchar (' '); print_vma (psym->st_size, DEC_5); printf (" %-7s", get_symbol_type (ELF_ST_TYPE (psym->st_info))); printf (" %-6s", get_symbol_binding (ELF_ST_BIND (psym->st_info))); - printf (" %-7s", get_symbol_visibility (ELF_ST_VISIBILITY (psym->st_other))); - /* Check to see if any other bits in the st_other field are set. - Note - displaying this information disrupts the layout of the - table being generated, but for the moment this case is very rare. */ - if (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other)) - printf (" [%s] ", get_symbol_other (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other))); + if (elf_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + printf (" %-7s", get_solaris_symbol_visibility (psym->st_other)); + else + { + unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); + + printf (" %-7s", get_symbol_visibility (vis)); + /* Check to see if any other bits in the st_other field are set. + Note - displaying this information disrupts the layout of the + table being generated, but for the moment this case is very rare. */ + if (psym->st_other ^ vis) + printf (" [%s] ", get_symbol_other (psym->st_other ^ vis)); + } printf (" %4s ", get_symbol_index_type (psym->st_shndx)); print_symbol (25, psym->st_name < strtab_size ? strtab + psym->st_name : _("")); - if (section->sh_type == SHT_DYNSYM - && version_info[DT_VERSIONTAGIDX (DT_VERSYM)] != 0) + version_string + = get_symbol_version_string (file, + section->sh_type == SHT_DYNSYM, + strtab, strtab_size, si, + psym, &sym_info, &vna_other); + if (version_string) { - unsigned char data[2]; - unsigned short vers_data; - unsigned long offset; - int is_nobits; - int check_def; - - offset = offset_from_vma - (file, version_info[DT_VERSIONTAGIDX (DT_VERSYM)], - sizeof data + si * sizeof (vers_data)); - - if (get_data (&data, file, offset + si * sizeof (vers_data), - sizeof (data), 1, _("version data")) == NULL) - break; + if (sym_info == symbol_undefined) + printf ("@%s (%d)", version_string, vna_other); + else + printf (sym_info == symbol_hidden ? "@%s" : "@@%s", + version_string); + } - vers_data = byte_get (data, 2); + putchar ('\n'); - is_nobits = (psym->st_shndx < elf_header.e_shnum - && section_headers[psym->st_shndx].sh_type - == SHT_NOBITS); + if (ELF_ST_BIND (psym->st_info) == STB_LOCAL + && si >= section->sh_info + /* Irix 5 and 6 MIPS binaries are known to ignore this requirement. */ + && elf_header.e_machine != EM_MIPS + /* Solaris binaries have been found to violate this requirement as + well. Not sure if this is a bug or an ABI requirement. */ + && elf_header.e_ident[EI_OSABI] != ELFOSABI_SOLARIS) + warn (_("local symbol %u found at index >= %s's sh_info value of %u\n"), + si, printable_section_name (section), section->sh_info); + } - check_def = (psym->st_shndx != SHN_UNDEF); + free (symtab); + if (strtab != string_table) + free (strtab); + } + } + else if (do_syms) + printf + (_("\nDynamic symbol information is not available for displaying symbols.\n")); - if ((vers_data & VERSYM_HIDDEN) || vers_data > 1) - { - if (version_info[DT_VERSIONTAGIDX (DT_VERNEED)] - && (is_nobits || ! check_def)) - { - Elf_External_Verneed evn; - Elf_Internal_Verneed ivn; - Elf_Internal_Vernaux ivna; + if (do_histogram && buckets != NULL) + { + unsigned long * lengths; + unsigned long * counts; + unsigned long hn; + bfd_vma si; + unsigned long maxlength = 0; + unsigned long nzero_counts = 0; + unsigned long nsyms = 0; + unsigned long chained; - /* We must test both. */ - offset = offset_from_vma - (file, version_info[DT_VERSIONTAGIDX (DT_VERNEED)], - sizeof evn); + printf (_("\nHistogram for bucket list length (total of %lu buckets):\n"), + (unsigned long) nbuckets); - do - { - unsigned long vna_off; + lengths = (unsigned long *) calloc (nbuckets, sizeof (*lengths)); + if (lengths == NULL) + { + error (_("Out of memory allocating space for histogram buckets\n")); + return FALSE; + } - if (get_data (&evn, file, offset, sizeof (evn), 1, - _("version need")) == NULL) - { - ivna.vna_next = 0; - ivna.vna_other = 0; - ivna.vna_name = 0; - break; - } + printf (_(" Length Number %% of total Coverage\n")); + for (hn = 0; hn < nbuckets; ++hn) + { + for (si = buckets[hn], chained = 0; + si > 0 && si < nchains && si < nbuckets && chained <= nchains; + si = chains[si], ++chained) + { + ++nsyms; + if (maxlength < ++lengths[hn]) + ++maxlength; + } - ivn.vn_aux = BYTE_GET (evn.vn_aux); - ivn.vn_next = BYTE_GET (evn.vn_next); + /* PR binutils/17531: A corrupt binary could contain broken + histogram data. Do not go into an infinite loop trying + to process it. */ + if (chained > nchains) + { + error (_("histogram chain is corrupt\n")); + break; + } + } - vna_off = offset + ivn.vn_aux; + counts = (unsigned long *) calloc (maxlength + 1, sizeof (*counts)); + if (counts == NULL) + { + free (lengths); + error (_("Out of memory allocating space for histogram counts\n")); + return FALSE; + } - do - { - Elf_External_Vernaux evna; - - if (get_data (&evna, file, vna_off, - sizeof (evna), 1, - _("version need aux (3)")) == NULL) - { - ivna.vna_next = 0; - ivna.vna_other = 0; - ivna.vna_name = 0; - } - else - { - ivna.vna_other = BYTE_GET (evna.vna_other); - ivna.vna_next = BYTE_GET (evna.vna_next); - ivna.vna_name = BYTE_GET (evna.vna_name); - } - - vna_off += ivna.vna_next; - } - while (ivna.vna_other != vers_data - && ivna.vna_next != 0); - - if (ivna.vna_other == vers_data) - break; - - offset += ivn.vn_next; - } - while (ivn.vn_next != 0); - - if (ivna.vna_other == vers_data) - { - printf ("@%s (%d)", - ivna.vna_name < strtab_size - ? strtab + ivna.vna_name : _(""), - ivna.vna_other); - check_def = 0; - } - else if (! is_nobits) - error (_("bad dynamic symbol\n")); - else - check_def = 1; - } - - if (check_def) - { - if (vers_data != 0x8001 - && version_info[DT_VERSIONTAGIDX (DT_VERDEF)]) - { - Elf_Internal_Verdef ivd; - Elf_Internal_Verdaux ivda; - Elf_External_Verdaux evda; - unsigned long off; - - off = offset_from_vma - (file, - version_info[DT_VERSIONTAGIDX (DT_VERDEF)], - sizeof (Elf_External_Verdef)); - - do - { - Elf_External_Verdef evd; - - if (get_data (&evd, file, off, sizeof (evd), - 1, _("version def")) == NULL) - { - ivd.vd_ndx = 0; - ivd.vd_aux = 0; - ivd.vd_next = 0; - } - else - { - ivd.vd_ndx = BYTE_GET (evd.vd_ndx); - ivd.vd_aux = BYTE_GET (evd.vd_aux); - ivd.vd_next = BYTE_GET (evd.vd_next); - } - - off += ivd.vd_next; - } - while (ivd.vd_ndx != (vers_data & VERSYM_VERSION) - && ivd.vd_next != 0); - - off -= ivd.vd_next; - off += ivd.vd_aux; - - if (get_data (&evda, file, off, sizeof (evda), - 1, _("version def aux")) == NULL) - break; - - ivda.vda_name = BYTE_GET (evda.vda_name); - - if (psym->st_name != ivda.vda_name) - printf ((vers_data & VERSYM_HIDDEN) - ? "@%s" : "@@%s", - ivda.vda_name < strtab_size - ? strtab + ivda.vda_name : _("")); - } - } - } - } - - putchar ('\n'); - } - - free (symtab); - if (strtab != string_table) - free (strtab); - } - } - else if (do_syms) - printf - (_("\nDynamic symbol information is not available for displaying symbols.\n")); - - if (do_histogram && buckets != NULL) - { - unsigned long * lengths; - unsigned long * counts; - unsigned long hn; - bfd_vma si; - unsigned long maxlength = 0; - unsigned long nzero_counts = 0; - unsigned long nsyms = 0; - - printf (_("\nHistogram for bucket list length (total of %lu buckets):\n"), - (unsigned long) nbuckets); - printf (_(" Length Number %% of total Coverage\n")); - - lengths = (unsigned long *) calloc (nbuckets, sizeof (*lengths)); - if (lengths == NULL) - { - error (_("Out of memory\n")); - return 0; - } - for (hn = 0; hn < nbuckets; ++hn) - { - for (si = buckets[hn]; si > 0 && si < nchains; si = chains[si]) - { - ++nsyms; - if (maxlength < ++lengths[hn]) - ++maxlength; - } - } - - counts = (unsigned long *) calloc (maxlength + 1, sizeof (*counts)); - if (counts == NULL) - { - error (_("Out of memory\n")); - return 0; - } - - for (hn = 0; hn < nbuckets; ++hn) - ++counts[lengths[hn]]; + for (hn = 0; hn < nbuckets; ++hn) + ++counts[lengths[hn]]; if (nbuckets > 0) { @@ -9898,15 +11629,16 @@ process_symbol_table (FILE * file) unsigned long nzero_counts = 0; unsigned long nsyms = 0; + printf (_("\nHistogram for `.gnu.hash' bucket list length (total of %lu buckets):\n"), + (unsigned long) ngnubuckets); + lengths = (unsigned long *) calloc (ngnubuckets, sizeof (*lengths)); if (lengths == NULL) { - error (_("Out of memory\n")); - return 0; + error (_("Out of memory allocating space for gnu histogram buckets\n")); + return FALSE; } - printf (_("\nHistogram for `.gnu.hash' bucket list length (total of %lu buckets):\n"), - (unsigned long) ngnubuckets); printf (_(" Length Number %% of total Coverage\n")); for (hn = 0; hn < ngnubuckets; ++hn) @@ -9915,7 +11647,9 @@ process_symbol_table (FILE * file) bfd_vma off, length = 1; for (off = gnubuckets[hn] - gnusymidx; - (gnuchains[off] & 1) == 0; ++off) + /* PR 17531 file: 010-77222-0.004. */ + off < ngnuchains && (gnuchains[off] & 1) == 0; + ++off) ++length; lengths[hn] = length; if (length > maxlength) @@ -9926,8 +11660,9 @@ process_symbol_table (FILE * file) counts = (unsigned long *) calloc (maxlength + 1, sizeof (*counts)); if (counts == NULL) { - error (_("Out of memory\n")); - return 0; + free (lengths); + error (_("Out of memory allocating space for gnu histogram counts\n")); + return FALSE; } for (hn = 0; hn < ngnubuckets; ++hn) @@ -9953,10 +11688,10 @@ process_symbol_table (FILE * file) free (gnuchains); } - return 1; + return TRUE; } -static int +static bfd_boolean process_syminfo (FILE * file ATTRIBUTE_UNUSED) { unsigned int i; @@ -9964,11 +11699,11 @@ process_syminfo (FILE * file ATTRIBUTE_UNUSED) if (dynamic_syminfo == NULL || !do_dynamic) /* No syminfo, this is ok. */ - return 1; + return TRUE; /* There better should be a dynamic symbol section. */ if (dynamic_symbols == NULL || dynamic_strings == NULL) - return 0; + return FALSE; if (dynamic_addr) printf (_("\nDynamic info segment at offset 0x%lx contains %d entries:\n"), @@ -9980,7 +11715,9 @@ process_syminfo (FILE * file ATTRIBUTE_UNUSED) unsigned short int flags = dynamic_syminfo[i].si_flags; printf ("%4d: ", i); - if (VALID_DYNAMIC_NAME (dynamic_symbols[i].st_name)) + if (i >= num_dynamic_syms) + printf (_("")); + else if (VALID_DYNAMIC_NAME (dynamic_symbols[i].st_name)) print_symbol (30, GET_DYNAMIC_NAME (dynamic_symbols[i].st_name)); else printf (_(""), dynamic_symbols[i].st_name); @@ -10019,19 +11756,35 @@ process_syminfo (FILE * file ATTRIBUTE_UNUSED) puts (""); } - return 1; + return TRUE; } +#define IN_RANGE(START,END,ADDR,OFF) \ + (((ADDR) >= (START)) && ((ADDR) + (OFF) < (END))) + /* Check to see if the given reloc needs to be handled in a target specific manner. If so then process the reloc and return TRUE otherwise return - FALSE. */ + FALSE. + + If called with reloc == NULL, then this is a signal that reloc processing + for the current section has finished, and any saved state should be + discarded. */ static bfd_boolean target_specific_reloc_handling (Elf_Internal_Rela * reloc, unsigned char * start, - Elf_Internal_Sym * symtab) + unsigned char * end, + Elf_Internal_Sym * symtab, + unsigned long num_syms) { - unsigned int reloc_type = get_reloc_type (reloc->r_info); + unsigned int reloc_type = 0; + unsigned long sym_index = 0; + + if (reloc) + { + reloc_type = get_reloc_type (reloc->r_info); + sym_index = get_reloc_symindex (reloc->r_info); + } switch (elf_header.e_machine) { @@ -10040,19 +11793,31 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, { static Elf_Internal_Sym * saved_sym = NULL; + if (reloc == NULL) + { + saved_sym = NULL; + return TRUE; + } + switch (reloc_type) { case 10: /* R_MSP430_SYM_DIFF */ if (uses_msp430x_relocs ()) break; + /* Fall through. */ case 21: /* R_MSP430X_SYM_DIFF */ - saved_sym = symtab + get_reloc_symindex (reloc->r_info); + /* PR 21139. */ + if (sym_index >= num_syms) + error (_("MSP430 SYM_DIFF reloc contains invalid symbol index %lu\n"), + sym_index); + else + saved_sym = symtab + sym_index; return TRUE; case 1: /* R_MSP430_32 or R_MSP430_ABS32 */ case 3: /* R_MSP430_16 or R_MSP430_ABS8 */ goto handle_sym_diff; - + case 5: /* R_MSP430_16_BYTE */ case 9: /* R_MSP430_8 */ if (uses_msp430x_relocs ()) @@ -10064,17 +11829,28 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, if (! uses_msp430x_relocs ()) break; goto handle_sym_diff; - + handle_sym_diff: if (saved_sym != NULL) { + int reloc_size = reloc_type == 1 ? 4 : 2; bfd_vma value; - value = reloc->r_addend - + (symtab[get_reloc_symindex (reloc->r_info)].st_value - - saved_sym->st_value); + if (sym_index >= num_syms) + error (_("MSP430 reloc contains invalid symbol index %lu\n"), + sym_index); + else + { + value = reloc->r_addend + (symtab[sym_index].st_value + - saved_sym->st_value); - byte_put (start + reloc->r_offset, value, reloc_type == 1 ? 4 : 2); + if (IN_RANGE (start, end, start + reloc->r_offset, reloc_size)) + byte_put (start + reloc->r_offset, value, reloc_size); + else + /* PR 21137 */ + error (_("MSP430 sym diff reloc contains invalid offset: 0x%lx\n"), + (long) reloc->r_offset); + } saved_sym = NULL; return TRUE; @@ -10083,7 +11859,7 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, default: if (saved_sym != NULL) - error (_("Unhandled MSP430 reloc type found after SYM_DIFF reloc")); + error (_("Unhandled MSP430 reloc type found after SYM_DIFF reloc\n")); break; } break; @@ -10094,24 +11870,45 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, { static Elf_Internal_Sym * saved_sym = NULL; + if (reloc == NULL) + { + saved_sym = NULL; + return TRUE; + } + switch (reloc_type) { case 34: /* R_MN10300_ALIGN */ return TRUE; case 33: /* R_MN10300_SYM_DIFF */ - saved_sym = symtab + get_reloc_symindex (reloc->r_info); + if (sym_index >= num_syms) + error (_("MN10300_SYM_DIFF reloc contains invalid symbol index %lu\n"), + sym_index); + else + saved_sym = symtab + sym_index; return TRUE; + case 1: /* R_MN10300_32 */ case 2: /* R_MN10300_16 */ if (saved_sym != NULL) { + int reloc_size = reloc_type == 1 ? 4 : 2; bfd_vma value; - value = reloc->r_addend - + (symtab[get_reloc_symindex (reloc->r_info)].st_value - - saved_sym->st_value); + if (sym_index >= num_syms) + error (_("MN10300 reloc contains invalid symbol index %lu\n"), + sym_index); + else + { + value = reloc->r_addend + (symtab[sym_index].st_value + - saved_sym->st_value); - byte_put (start + reloc->r_offset, value, reloc_type == 1 ? 4 : 2); + if (IN_RANGE (start, end, start + reloc->r_offset, reloc_size)) + byte_put (start + reloc->r_offset, value, reloc_size); + else + error (_("MN10300 sym diff reloc contains invalid offset: 0x%lx\n"), + (long) reloc->r_offset); + } saved_sym = NULL; return TRUE; @@ -10119,7 +11916,63 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, break; default: if (saved_sym != NULL) - error (_("Unhandled MN10300 reloc type found after SYM_DIFF reloc")); + error (_("Unhandled MN10300 reloc type found after SYM_DIFF reloc\n")); + break; + } + break; + } + + case EM_RL78: + { + static bfd_vma saved_sym1 = 0; + static bfd_vma saved_sym2 = 0; + static bfd_vma value; + + if (reloc == NULL) + { + saved_sym1 = saved_sym2 = 0; + return TRUE; + } + + switch (reloc_type) + { + case 0x80: /* R_RL78_SYM. */ + saved_sym1 = saved_sym2; + if (sym_index >= num_syms) + error (_("RL78_SYM reloc contains invalid symbol index %lu\n"), + sym_index); + else + { + saved_sym2 = symtab[sym_index].st_value; + saved_sym2 += reloc->r_addend; + } + return TRUE; + + case 0x83: /* R_RL78_OPsub. */ + value = saved_sym1 - saved_sym2; + saved_sym2 = saved_sym1 = 0; + return TRUE; + break; + + case 0x41: /* R_RL78_ABS32. */ + if (IN_RANGE (start, end, start + reloc->r_offset, 4)) + byte_put (start + reloc->r_offset, value, 4); + else + error (_("RL78 sym diff reloc contains invalid offset: 0x%lx\n"), + (long) reloc->r_offset); + value = 0; + return TRUE; + + case 0x43: /* R_RL78_ABS16. */ + if (IN_RANGE (start, end, start + reloc->r_offset, 2)) + byte_put (start + reloc->r_offset, value, 2); + else + error (_("RL78 sym diff reloc contains invalid offset: 0x%lx\n"), + (long) reloc->r_offset); + value = 0; + return TRUE; + + default: break; } break; @@ -10143,10 +11996,11 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, static bfd_boolean is_32bit_abs_reloc (unsigned int reloc_type) { + /* Please keep this table alpha-sorted for ease of visual lookup. */ switch (elf_header.e_machine) { case EM_386: - case EM_486: + case EM_IAMCU: return reloc_type == 1; /* R_386_32. */ case EM_68K: return reloc_type == 1; /* R_68K_32. */ @@ -10155,18 +12009,22 @@ is_32bit_abs_reloc (unsigned int reloc_type) case EM_960: return reloc_type == 2; /* R_960_32. */ case EM_AARCH64: - return reloc_type == 258; /* R_AARCH64_ABS32 */ + return (reloc_type == 258 + || reloc_type == 1); /* R_AARCH64_ABS32 || R_AARCH64_P32_ABS32 */ + case EM_ADAPTEVA_EPIPHANY: + return reloc_type == 3; case EM_ALPHA: return reloc_type == 1; /* R_ALPHA_REFLONG. */ case EM_ARC: return reloc_type == 1; /* R_ARC_32. */ + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: + return reloc_type == 4; /* R_ARC_32. */ case EM_ARM: return reloc_type == 2; /* R_ARM_ABS32 */ case EM_AVR_OLD: case EM_AVR: return reloc_type == 1; - case EM_ADAPTEVA_EPIPHANY: - return reloc_type == 3; case EM_BLACKFIN: return reloc_type == 0x12; /* R_byte4_data. */ case EM_CRIS: @@ -10188,12 +12046,15 @@ is_32bit_abs_reloc (unsigned int reloc_type) case EM_CYGNUS_FR30: case EM_FR30: return reloc_type == 3; /* R_FR30_32. */ + case EM_FT32: + return reloc_type == 1; /* R_FT32_32. */ case EM_H8S: case EM_H8_300: case EM_H8_300H: return reloc_type == 1; /* R_H8_DIR32. */ case EM_IA_64: - return reloc_type == 0x65; /* R_IA64_SECREL32LSB. */ + return reloc_type == 0x65 /* R_IA64_SECREL32LSB. */ + || reloc_type == 0x25; /* R_IA64_DIR32LSB. */ case EM_IP2K_OLD: case EM_IP2K: return reloc_type == 2; /* R_IP2K_32. */ @@ -10206,6 +12067,9 @@ is_32bit_abs_reloc (unsigned int reloc_type) return reloc_type == 3; /* R_M32C_32. */ case EM_M32R: return reloc_type == 34; /* R_M32R_32_RELA. */ + case EM_68HC11: + case EM_68HC12: + return reloc_type == 6; /* R_M68HC11_32. */ case EM_MCORE: return reloc_type == 1; /* R_MCORE_ADDR32. */ case EM_CYGNUS_MEP: @@ -10231,13 +12095,14 @@ is_32bit_abs_reloc (unsigned int reloc_type) return reloc_type == 1; /* R_MSP430_32 or R_MSP320_ABS32. */ case EM_MT: return reloc_type == 2; /* R_MT_32. */ + case EM_NDS32: + return reloc_type == 20; /* R_NDS32_RELA. */ case EM_ALTERA_NIOS2: return reloc_type == 12; /* R_NIOS2_BFD_RELOC_32. */ case EM_NIOS32: return reloc_type == 1; /* R_NIOS_32. */ - case EM_OPENRISC: - case EM_OR32: - return reloc_type == 1; /* R_OR32_32. */ + case EM_OR1K: + return reloc_type == 1; /* R_OR1K_32. */ case EM_PARISC: return (reloc_type == 1 /* R_PARISC_DIR32. */ || reloc_type == 41); /* R_PARISC_SECREL32. */ @@ -10248,6 +12113,10 @@ is_32bit_abs_reloc (unsigned int reloc_type) return reloc_type == 1; /* R_PPC64_ADDR32. */ case EM_PPC: return reloc_type == 1; /* R_PPC_ADDR32. */ + case EM_TI_PRU: + return reloc_type == 11; /* R_PRU_BFD_RELOC_32. */ + case EM_RISCV: + return reloc_type == 1; /* R_RISCV_32. */ case EM_RL78: return reloc_type == 1; /* R_RL78_DIR32. */ case EM_RX: @@ -10281,6 +12150,10 @@ is_32bit_abs_reloc (unsigned int reloc_type) return reloc_type == 0x33; /* R_V810_WORD. */ case EM_VAX: return reloc_type == 1; /* R_VAX_32. */ + case EM_VISIUM: + return reloc_type == 3; /* R_VISIUM_32. */ + case EM_WEBASSEMBLY: + return reloc_type == 1; /* R_WASM32_32. */ case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -10296,9 +12169,16 @@ is_32bit_abs_reloc (unsigned int reloc_type) case EM_XTENSA: return reloc_type == 1; /* R_XTENSA_32. */ default: - error (_("Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"), - elf_header.e_machine); - abort (); + { + static unsigned int prev_warn = 0; + + /* Avoid repeating the same warning multiple times. */ + if (prev_warn != elf_header.e_machine) + error (_("Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"), + elf_header.e_machine); + prev_warn = elf_header.e_machine; + return FALSE; + } } } @@ -10309,9 +12189,10 @@ static bfd_boolean is_32bit_pcrel_reloc (unsigned int reloc_type) { switch (elf_header.e_machine) + /* Please keep this table alpha-sorted for ease of visual lookup. */ { case EM_386: - case EM_486: + case EM_IAMCU: return reloc_type == 2; /* R_386_PC32. */ case EM_68K: return reloc_type == 4; /* R_68K_PC32. */ @@ -10321,10 +12202,18 @@ is_32bit_pcrel_reloc (unsigned int reloc_type) return reloc_type == 6; case EM_ALPHA: return reloc_type == 10; /* R_ALPHA_SREL32. */ + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: + return reloc_type == 49; /* R_ARC_32_PCREL. */ case EM_ARM: return reloc_type == 3; /* R_ARM_REL32 */ + case EM_AVR_OLD: + case EM_AVR: + return reloc_type == 36; /* R_AVR_32_PCREL. */ case EM_MICROBLAZE: return reloc_type == 2; /* R_MICROBLAZE_32_PCREL. */ + case EM_OR1K: + return reloc_type == 9; /* R_OR1K_32_PCREL. */ case EM_PARISC: return reloc_type == 9; /* R_PARISC_PCREL32. */ case EM_PPC: @@ -10346,6 +12235,8 @@ is_32bit_pcrel_reloc (unsigned int reloc_type) return reloc_type == 6; /* R_TILEGX_32_PCREL. */ case EM_TILEPRO: return reloc_type == 4; /* R_TILEPRO_32_PCREL. */ + case EM_VISIUM: + return reloc_type == 6; /* R_VISIUM_32_PCREL */ case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -10381,6 +12272,8 @@ is_64bit_abs_reloc (unsigned int reloc_type) return reloc_type == 80; /* R_PARISC_DIR64. */ case EM_PPC64: return reloc_type == 38; /* R_PPC64_ADDR64. */ + case EM_RISCV: + return reloc_type == 2; /* R_RISCV_64. */ case EM_SPARC32PLUS: case EM_SPARCV9: case EM_SPARC: @@ -10448,6 +12341,8 @@ is_24bit_abs_reloc (unsigned int reloc_type) case EM_CYGNUS_MN10200: case EM_MN10200: return reloc_type == 4; /* R_MN10200_24. */ + case EM_FT32: + return reloc_type == 5; /* R_FT32_20. */ default: return FALSE; } @@ -10459,13 +12354,18 @@ is_24bit_abs_reloc (unsigned int reloc_type) static bfd_boolean is_16bit_abs_reloc (unsigned int reloc_type) { + /* Please keep this table alpha-sorted for ease of visual lookup. */ switch (elf_header.e_machine) { + case EM_ARC: + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: + return reloc_type == 2; /* R_ARC_16. */ + case EM_ADAPTEVA_EPIPHANY: + return reloc_type == 5; case EM_AVR_OLD: case EM_AVR: return reloc_type == 4; /* R_AVR_16. */ - case EM_ADAPTEVA_EPIPHANY: - return reloc_type == 5; case EM_CYGNUS_D10V: case EM_D10V: return reloc_type == 3; /* R_D10V_16. */ @@ -10479,26 +12379,35 @@ is_16bit_abs_reloc (unsigned int reloc_type) case EM_M32C_OLD: case EM_M32C: return reloc_type == 1; /* R_M32C_16 */ + case EM_CYGNUS_MN10200: + case EM_MN10200: + return reloc_type == 2; /* R_MN10200_16. */ + case EM_CYGNUS_MN10300: + case EM_MN10300: + return reloc_type == 2; /* R_MN10300_16. */ case EM_MSP430: if (uses_msp430x_relocs ()) return reloc_type == 2; /* R_MSP430_ABS16. */ + /* Fall through. */ case EM_MSP430_OLD: return reloc_type == 5; /* R_MSP430_16_BYTE. */ + case EM_NDS32: + return reloc_type == 19; /* R_NDS32_RELA. */ case EM_ALTERA_NIOS2: return reloc_type == 13; /* R_NIOS2_BFD_RELOC_16. */ case EM_NIOS32: return reloc_type == 9; /* R_NIOS_16. */ + case EM_OR1K: + return reloc_type == 2; /* R_OR1K_16. */ + case EM_TI_PRU: + return reloc_type == 8; /* R_PRU_BFD_RELOC_16. */ case EM_TI_C6000: return reloc_type == 2; /* R_C6000_ABS16. */ + case EM_VISIUM: + return reloc_type == 2; /* R_VISIUM_16. */ case EM_XC16X: case EM_C166: return reloc_type == 2; /* R_XC16C_ABS_16. */ - case EM_CYGNUS_MN10200: - case EM_MN10200: - return reloc_type == 2; /* R_MN10200_16. */ - case EM_CYGNUS_MN10300: - case EM_MN10300: - return reloc_type == 2; /* R_MN10300_16. */ case EM_XGATE: return reloc_type == 3; /* R_XGATE_16. */ default: @@ -10514,66 +12423,128 @@ is_none_reloc (unsigned int reloc_type) { switch (elf_header.e_machine) { - case EM_68K: /* R_68K_NONE. */ case EM_386: /* R_386_NONE. */ - case EM_SPARC32PLUS: - case EM_SPARCV9: - case EM_SPARC: /* R_SPARC_NONE. */ - case EM_MIPS: /* R_MIPS_NONE. */ - case EM_PARISC: /* R_PARISC_NONE. */ - case EM_ALPHA: /* R_ALPHA_NONE. */ + case EM_68K: /* R_68K_NONE. */ case EM_ADAPTEVA_EPIPHANY: - case EM_PPC: /* R_PPC_NONE. */ - case EM_PPC64: /* R_PPC64_NONE. */ + case EM_ALPHA: /* R_ALPHA_NONE. */ + case EM_ALTERA_NIOS2: /* R_NIOS2_NONE. */ + case EM_ARC: /* R_ARC_NONE. */ + case EM_ARC_COMPACT2: /* R_ARC_NONE. */ + case EM_ARC_COMPACT: /* R_ARC_NONE. */ case EM_ARM: /* R_ARM_NONE. */ - case EM_IA_64: /* R_IA64_NONE. */ - case EM_SH: /* R_SH_NONE. */ - case EM_S390_OLD: - case EM_S390: /* R_390_NONE. */ + case EM_C166: /* R_XC16X_NONE. */ case EM_CRIS: /* R_CRIS_NONE. */ - case EM_X86_64: /* R_X86_64_NONE. */ - case EM_L1OM: /* R_X86_64_NONE. */ + case EM_FT32: /* R_FT32_NONE. */ + case EM_IA_64: /* R_IA64_NONE. */ case EM_K1OM: /* R_X86_64_NONE. */ + case EM_L1OM: /* R_X86_64_NONE. */ + case EM_M32R: /* R_M32R_NONE. */ + case EM_MIPS: /* R_MIPS_NONE. */ case EM_MN10300: /* R_MN10300_NONE. */ case EM_MOXIE: /* R_MOXIE_NONE. */ - case EM_M32R: /* R_M32R_NONE. */ - case EM_TI_C6000:/* R_C6000_NONE. */ + case EM_NIOS32: /* R_NIOS_NONE. */ + case EM_OR1K: /* R_OR1K_NONE. */ + case EM_PARISC: /* R_PARISC_NONE. */ + case EM_PPC64: /* R_PPC64_NONE. */ + case EM_PPC: /* R_PPC_NONE. */ + case EM_RISCV: /* R_RISCV_NONE. */ + case EM_S390: /* R_390_NONE. */ + case EM_S390_OLD: + case EM_SH: /* R_SH_NONE. */ + case EM_SPARC32PLUS: + case EM_SPARC: /* R_SPARC_NONE. */ + case EM_SPARCV9: case EM_TILEGX: /* R_TILEGX_NONE. */ case EM_TILEPRO: /* R_TILEPRO_NONE. */ + case EM_TI_C6000:/* R_C6000_NONE. */ + case EM_X86_64: /* R_X86_64_NONE. */ case EM_XC16X: - case EM_C166: /* R_XC16X_NONE. */ - case EM_ALTERA_NIOS2: /* R_NIOS2_NONE. */ - case EM_NIOS32: /* R_NIOS_NONE. */ + case EM_WEBASSEMBLY: /* R_WASM32_NONE. */ return reloc_type == 0; + case EM_AARCH64: return reloc_type == 0 || reloc_type == 256; + case EM_AVR_OLD: + case EM_AVR: + return (reloc_type == 0 /* R_AVR_NONE. */ + || reloc_type == 30 /* R_AVR_DIFF8. */ + || reloc_type == 31 /* R_AVR_DIFF16. */ + || reloc_type == 32 /* R_AVR_DIFF32. */); + case EM_METAG: + return reloc_type == 3; /* R_METAG_NONE. */ + case EM_NDS32: + return (reloc_type == 0 /* R_XTENSA_NONE. */ + || reloc_type == 204 /* R_NDS32_DIFF8. */ + || reloc_type == 205 /* R_NDS32_DIFF16. */ + || reloc_type == 206 /* R_NDS32_DIFF32. */ + || reloc_type == 207 /* R_NDS32_ULEB128. */); + case EM_TI_PRU: + return (reloc_type == 0 /* R_PRU_NONE. */ + || reloc_type == 65 /* R_PRU_DIFF8. */ + || reloc_type == 66 /* R_PRU_DIFF16. */ + || reloc_type == 67 /* R_PRU_DIFF32. */); case EM_XTENSA_OLD: case EM_XTENSA: return (reloc_type == 0 /* R_XTENSA_NONE. */ || reloc_type == 17 /* R_XTENSA_DIFF8. */ || reloc_type == 18 /* R_XTENSA_DIFF16. */ || reloc_type == 19 /* R_XTENSA_DIFF32. */); - case EM_METAG: - return reloc_type == 3; /* R_METAG_NONE. */ } return FALSE; } +/* Returns TRUE if there is a relocation against + section NAME at OFFSET bytes. */ + +bfd_boolean +reloc_at (struct dwarf_section * dsec, dwarf_vma offset) +{ + Elf_Internal_Rela * relocs; + Elf_Internal_Rela * rp; + + if (dsec == NULL || dsec->reloc_info == NULL) + return FALSE; + + relocs = (Elf_Internal_Rela *) dsec->reloc_info; + + for (rp = relocs; rp < relocs + dsec->num_relocs; ++rp) + if (rp->r_offset == offset) + return TRUE; + + return FALSE; +} + /* Apply relocations to a section. + Returns TRUE upon success, FALSE otherwise. + If RELOCS_RETURN is non-NULL then it is set to point to the loaded relocs. + It is then the caller's responsibility to free them. NUM_RELOCS_RETURN + will be set to the number of relocs loaded. + Note: So far support has been added only for those relocations - which can be found in debug sections. - FIXME: Add support for more relocations ? */ + which can be found in debug sections. FIXME: Add support for + more relocations ? */ -static void -apply_relocations (void * file, - Elf_Internal_Shdr * section, - unsigned char * start) +static bfd_boolean +apply_relocations (void * file, + const Elf_Internal_Shdr * section, + unsigned char * start, + bfd_size_type size, + void ** relocs_return, + unsigned long * num_relocs_return) { Elf_Internal_Shdr * relsec; - unsigned char * end = start + section->sh_size; + unsigned char * end = start + size; + bfd_boolean res = TRUE; + + if (relocs_return != NULL) + { + * (Elf_Internal_Rela **) relocs_return = NULL; + * num_relocs_return = 0; + } if (elf_header.e_type != ET_REL) - return; + /* No relocs to apply. */ + return TRUE; /* Find the reloc section associated with the section. */ for (relsec = section_headers; @@ -10602,13 +12573,13 @@ apply_relocations (void * file, { if (!slurp_rela_relocs ((FILE *) file, relsec->sh_offset, relsec->sh_size, & relocs, & num_relocs)) - return; + return FALSE; } else { if (!slurp_rel_relocs ((FILE *) file, relsec->sh_offset, relsec->sh_size, & relocs, & num_relocs)) - return; + return FALSE; } /* SH uses RELA but uses in place value instead of the addend field. */ @@ -10616,6 +12587,9 @@ apply_relocations (void * file, is_rela = FALSE; symsec = section_headers + relsec->sh_link; + if (symsec->sh_type != SHT_SYMTAB + && symsec->sh_type != SHT_DYNSYM) + return FALSE; symtab = GET_ELF_SYMBOLS ((FILE *) file, symsec, & num_syms); for (rp = relocs; rp < relocs + num_relocs; ++rp) @@ -10628,7 +12602,7 @@ apply_relocations (void * file, reloc_type = get_reloc_type (rp->r_info); - if (target_specific_reloc_handling (rp, start, symtab)) + if (target_specific_reloc_handling (rp, start, end, symtab, num_syms)) continue; else if (is_none_reloc (reloc_type)) continue; @@ -10644,8 +12618,12 @@ apply_relocations (void * file, reloc_size = 2; else { - warn (_("unable to apply unsupported reloc type %d to section %s\n"), - reloc_type, SECTION_NAME (section)); + static unsigned int prev_reloc = 0; + if (reloc_type != prev_reloc) + warn (_("unable to apply unsupported reloc type %d to section %s\n"), + reloc_type, printable_section_name (section)); + prev_reloc = reloc_type; + res = FALSE; continue; } @@ -10654,7 +12632,8 @@ apply_relocations (void * file, { warn (_("skipping invalid relocation offset 0x%lx in section %s\n"), (unsigned long) rp->r_offset, - SECTION_NAME (section)); + printable_section_name (section)); + res = FALSE; continue; } @@ -10662,7 +12641,8 @@ apply_relocations (void * file, if (sym_index >= num_syms) { warn (_("skipping invalid relocation symbol index 0x%lx in section %s\n"), - sym_index, SECTION_NAME (section)); + sym_index, printable_section_name (section)); + res = FALSE; continue; } sym = symtab + sym_index; @@ -10681,12 +12661,14 @@ apply_relocations (void * file, referencing a global array. For an example of this see the _clz.o binary in libgcc.a. */ if (sym != symtab + && ELF_ST_TYPE (sym->st_info) != STT_COMMON && ELF_ST_TYPE (sym->st_info) > STT_SECTION) { warn (_("skipping unexpected symbol type %s in %ld'th relocation in section %s\n"), get_symbol_type (ELF_ST_TYPE (sym->st_info)), (long int)(rp - relocs), - SECTION_NAME (relsec)); + printable_section_name (relsec)); + res = FALSE; continue; } @@ -10720,21 +12702,33 @@ apply_relocations (void * file, } free (symtab); - free (relocs); + /* Let the target specific reloc processing code know that + we have finished with these relocs. */ + target_specific_reloc_handling (NULL, NULL, NULL, NULL, 0); + + if (relocs_return) + { + * (Elf_Internal_Rela **) relocs_return = relocs; + * num_relocs_return = num_relocs; + } + else + free (relocs); + break; } + + return res; } #ifdef SUPPORT_DISASSEMBLY -static int +static bfd_boolean disassemble_section (Elf_Internal_Shdr * section, FILE * file) { - printf (_("\nAssembly dump of section %s\n"), - SECTION_NAME (section)); + printf (_("\nAssembly dump of section %s\n"), printable_section_name (section)); - /* XXX -- to be done --- XXX */ + /* FIXME: XXX -- to be done --- XXX */ - return 1; + return TRUE; } #endif @@ -10751,7 +12745,7 @@ get_section_contents (Elf_Internal_Shdr * section, FILE * file) if (num_bytes == 0 || section->sh_type == SHT_NOBITS) { printf (_("\nSection '%s' has no data to dump.\n"), - SECTION_NAME (section)); + printable_section_name (section)); return NULL; } @@ -10759,23 +12753,139 @@ get_section_contents (Elf_Internal_Shdr * section, FILE * file) _("section contents")); } +/* Uncompresses a section that was compressed using zlib, in place. */ -static void -dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) +static bfd_boolean +uncompress_section_contents (unsigned char **buffer, + dwarf_size_type uncompressed_size, + dwarf_size_type *size) { - Elf_Internal_Shdr * relsec; - bfd_size_type num_bytes; - char * data; - char * end; - char * start; - char * name = SECTION_NAME (section); - bfd_boolean some_strings_shown; + dwarf_size_type compressed_size = *size; + unsigned char * compressed_buffer = *buffer; + unsigned char * uncompressed_buffer; + z_stream strm; + int rc; + + /* It is possible the section consists of several compressed + buffers concatenated together, so we uncompress in a loop. */ + /* PR 18313: The state field in the z_stream structure is supposed + to be invisible to the user (ie us), but some compilers will + still complain about it being used without initialisation. So + we first zero the entire z_stream structure and then set the fields + that we need. */ + memset (& strm, 0, sizeof strm); + strm.avail_in = compressed_size; + strm.next_in = (Bytef *) compressed_buffer; + strm.avail_out = uncompressed_size; + uncompressed_buffer = (unsigned char *) xmalloc (uncompressed_size); + + rc = inflateInit (& strm); + while (strm.avail_in > 0) + { + if (rc != Z_OK) + goto fail; + strm.next_out = ((Bytef *) uncompressed_buffer + + (uncompressed_size - strm.avail_out)); + rc = inflate (&strm, Z_FINISH); + if (rc != Z_STREAM_END) + goto fail; + rc = inflateReset (& strm); + } + rc = inflateEnd (& strm); + if (rc != Z_OK + || strm.avail_out != 0) + goto fail; + + *buffer = uncompressed_buffer; + *size = uncompressed_size; + return TRUE; + + fail: + free (uncompressed_buffer); + /* Indicate decompression failure. */ + *buffer = NULL; + return FALSE; +} - start = get_section_contents (section, file); +static bfd_boolean +dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) +{ + Elf_Internal_Shdr * relsec; + bfd_size_type num_bytes; + unsigned char * data; + unsigned char * end; + unsigned char * real_start; + unsigned char * start; + bfd_boolean some_strings_shown; + + real_start = start = (unsigned char *) get_section_contents (section, + file); if (start == NULL) - return; + return FALSE; + num_bytes = section->sh_size; + + printf (_("\nString dump of section '%s':\n"), printable_section_name (section)); + + if (decompress_dumps) + { + dwarf_size_type new_size = num_bytes; + dwarf_size_type uncompressed_size = 0; + + if ((section->sh_flags & SHF_COMPRESSED) != 0) + { + Elf_Internal_Chdr chdr; + unsigned int compression_header_size + = get_compression_header (& chdr, (unsigned char *) start, + num_bytes); + + if (chdr.ch_type != ELFCOMPRESS_ZLIB) + { + warn (_("section '%s' has unsupported compress type: %d\n"), + printable_section_name (section), chdr.ch_type); + return FALSE; + } + else if (chdr.ch_addralign != section->sh_addralign) + { + warn (_("compressed section '%s' is corrupted\n"), + printable_section_name (section)); + return FALSE; + } + uncompressed_size = chdr.ch_size; + start += compression_header_size; + new_size -= compression_header_size; + } + else if (new_size > 12 && streq ((char *) start, "ZLIB")) + { + /* Read the zlib header. In this case, it should be "ZLIB" + followed by the uncompressed section size, 8 bytes in + big-endian order. */ + uncompressed_size = start[4]; uncompressed_size <<= 8; + uncompressed_size += start[5]; uncompressed_size <<= 8; + uncompressed_size += start[6]; uncompressed_size <<= 8; + uncompressed_size += start[7]; uncompressed_size <<= 8; + uncompressed_size += start[8]; uncompressed_size <<= 8; + uncompressed_size += start[9]; uncompressed_size <<= 8; + uncompressed_size += start[10]; uncompressed_size <<= 8; + uncompressed_size += start[11]; + start += 12; + new_size -= 12; + } - printf (_("\nString dump of section '%s':\n"), name); + if (uncompressed_size) + { + if (uncompress_section_contents (& start, + uncompressed_size, & new_size)) + num_bytes = new_size; + else + { + error (_("Unable to decompress section %s\n"), + printable_section_name (section)); + return FALSE; + } + } + else + start = real_start; + } /* If the section being dumped has relocations against it the user might be expecting these relocations to have been applied. Check for this @@ -10797,7 +12907,6 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) break; } - num_bytes = section->sh_size; data = start; end = start + num_bytes; some_strings_shown = FALSE; @@ -10810,15 +12919,26 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) if (data < end) { + size_t maxlen = end - data; + #ifndef __MSVCRT__ /* PR 11128: Use two separate invocations in order to work around bugs in the Solaris 8 implementation of printf. */ printf (" [%6tx] ", data - start); - printf ("%s\n", data); #else - printf (" [%6Ix] %s\n", (size_t) (data - start), data); + printf (" [%6Ix] ", (size_t) (data - start)); #endif - data += strlen (data); + if (maxlen > 0) + { + print_symbol ((int) maxlen, (const char *) data); + putchar ('\n'); + data += strnlen ((const char *) data, maxlen); + } + else + { + printf (_("\n")); + data = end; + } some_strings_shown = TRUE; } } @@ -10826,31 +12946,100 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) if (! some_strings_shown) printf (_(" No strings found in this section.")); - free (start); + free (real_start); putchar ('\n'); + return TRUE; } -static void +static bfd_boolean dump_section_as_bytes (Elf_Internal_Shdr * section, FILE * file, bfd_boolean relocate) { Elf_Internal_Shdr * relsec; - bfd_size_type bytes; - bfd_vma addr; - unsigned char * data; - unsigned char * start; - - start = (unsigned char *) get_section_contents (section, file); + bfd_size_type bytes; + bfd_size_type section_size; + bfd_vma addr; + unsigned char * data; + unsigned char * real_start; + unsigned char * start; + + real_start = start = (unsigned char *) get_section_contents (section, file); if (start == NULL) - return; + return FALSE; + + section_size = section->sh_size; + + printf (_("\nHex dump of section '%s':\n"), printable_section_name (section)); + + if (decompress_dumps) + { + dwarf_size_type new_size = section_size; + dwarf_size_type uncompressed_size = 0; + + if ((section->sh_flags & SHF_COMPRESSED) != 0) + { + Elf_Internal_Chdr chdr; + unsigned int compression_header_size + = get_compression_header (& chdr, start, section_size); + + if (chdr.ch_type != ELFCOMPRESS_ZLIB) + { + warn (_("section '%s' has unsupported compress type: %d\n"), + printable_section_name (section), chdr.ch_type); + return FALSE; + } + else if (chdr.ch_addralign != section->sh_addralign) + { + warn (_("compressed section '%s' is corrupted\n"), + printable_section_name (section)); + return FALSE; + } + uncompressed_size = chdr.ch_size; + start += compression_header_size; + new_size -= compression_header_size; + } + else if (new_size > 12 && streq ((char *) start, "ZLIB")) + { + /* Read the zlib header. In this case, it should be "ZLIB" + followed by the uncompressed section size, 8 bytes in + big-endian order. */ + uncompressed_size = start[4]; uncompressed_size <<= 8; + uncompressed_size += start[5]; uncompressed_size <<= 8; + uncompressed_size += start[6]; uncompressed_size <<= 8; + uncompressed_size += start[7]; uncompressed_size <<= 8; + uncompressed_size += start[8]; uncompressed_size <<= 8; + uncompressed_size += start[9]; uncompressed_size <<= 8; + uncompressed_size += start[10]; uncompressed_size <<= 8; + uncompressed_size += start[11]; + start += 12; + new_size -= 12; + } - printf (_("\nHex dump of section '%s':\n"), SECTION_NAME (section)); + if (uncompressed_size) + { + if (uncompress_section_contents (& start, uncompressed_size, + & new_size)) + { + section_size = new_size; + } + else + { + error (_("Unable to decompress section %s\n"), + printable_section_name (section)); + /* FIXME: Print the section anyway ? */ + return FALSE; + } + } + else + start = real_start; + } if (relocate) { - apply_relocations (file, section, start); + if (! apply_relocations (file, section, start, section_size, NULL, NULL)) + return FALSE; } else { @@ -10876,7 +13065,7 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, } addr = section->sh_addr; - bytes = section->sh_size; + bytes = section_size; data = start; while (bytes) @@ -10916,96 +13105,26 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, bytes -= lbytes; } - free (start); + free (real_start); putchar ('\n'); + return TRUE; } -/* Uncompresses a section that was compressed using zlib, in place. */ - -static int -uncompress_section_contents (unsigned char **buffer ATTRIBUTE_UNUSED, - dwarf_size_type *size ATTRIBUTE_UNUSED) -{ -#ifndef HAVE_ZLIB_H - return FALSE; -#else - dwarf_size_type compressed_size = *size; - unsigned char * compressed_buffer = *buffer; - dwarf_size_type uncompressed_size; - unsigned char * uncompressed_buffer; - z_stream strm; - int rc; - dwarf_size_type header_size = 12; - - /* Read the zlib header. In this case, it should be "ZLIB" followed - by the uncompressed section size, 8 bytes in big-endian order. */ - if (compressed_size < header_size - || ! streq ((char *) compressed_buffer, "ZLIB")) - return 0; - - uncompressed_size = compressed_buffer[4]; uncompressed_size <<= 8; - uncompressed_size += compressed_buffer[5]; uncompressed_size <<= 8; - uncompressed_size += compressed_buffer[6]; uncompressed_size <<= 8; - uncompressed_size += compressed_buffer[7]; uncompressed_size <<= 8; - uncompressed_size += compressed_buffer[8]; uncompressed_size <<= 8; - uncompressed_size += compressed_buffer[9]; uncompressed_size <<= 8; - uncompressed_size += compressed_buffer[10]; uncompressed_size <<= 8; - uncompressed_size += compressed_buffer[11]; - - /* It is possible the section consists of several compressed - buffers concatenated together, so we uncompress in a loop. */ - strm.zalloc = NULL; - strm.zfree = NULL; - strm.opaque = NULL; - strm.avail_in = compressed_size - header_size; - strm.next_in = (Bytef *) compressed_buffer + header_size; - strm.avail_out = uncompressed_size; - uncompressed_buffer = (unsigned char *) xmalloc (uncompressed_size); - - rc = inflateInit (& strm); - while (strm.avail_in > 0) - { - if (rc != Z_OK) - goto fail; - strm.next_out = ((Bytef *) uncompressed_buffer - + (uncompressed_size - strm.avail_out)); - rc = inflate (&strm, Z_FINISH); - if (rc != Z_STREAM_END) - goto fail; - rc = inflateReset (& strm); - } - rc = inflateEnd (& strm); - if (rc != Z_OK - || strm.avail_out != 0) - goto fail; - - free (compressed_buffer); - *buffer = uncompressed_buffer; - *size = uncompressed_size; - return 1; - - fail: - free (uncompressed_buffer); - /* Indicate decompression failure. */ - *buffer = NULL; - return 0; -#endif /* HAVE_ZLIB_H */ -} - -static int +static bfd_boolean load_specific_debug_section (enum dwarf_section_display_enum debug, - Elf_Internal_Shdr * sec, void * file) + const Elf_Internal_Shdr * sec, void * file) { struct dwarf_section * section = &debug_displays [debug].section; char buf [64]; /* If it is already loaded, do nothing. */ if (section->start != NULL) - return 1; + return TRUE; snprintf (buf, sizeof (buf), _("%s section data"), section->name); section->address = sec->sh_addr; + section->user_data = NULL; section->start = (unsigned char *) get_data (NULL, (FILE *) file, sec->sh_offset, 1, sec->sh_size, buf); @@ -11013,25 +13132,103 @@ load_specific_debug_section (enum dwarf_section_display_enum debug, section->size = 0; else { - section->size = sec->sh_size; - if (uncompress_section_contents (§ion->start, §ion->size)) - sec->sh_size = section->size; + unsigned char *start = section->start; + dwarf_size_type size = sec->sh_size; + dwarf_size_type uncompressed_size = 0; + + if ((sec->sh_flags & SHF_COMPRESSED) != 0) + { + Elf_Internal_Chdr chdr; + unsigned int compression_header_size; + + if (size < (is_32bit_elf + ? sizeof (Elf32_External_Chdr) + : sizeof (Elf64_External_Chdr))) + { + warn (_("compressed section %s is too small to contain a compression header"), + section->name); + return FALSE; + } + + compression_header_size = get_compression_header (&chdr, start, size); + + if (chdr.ch_type != ELFCOMPRESS_ZLIB) + { + warn (_("section '%s' has unsupported compress type: %d\n"), + section->name, chdr.ch_type); + return FALSE; + } + else if (chdr.ch_addralign != sec->sh_addralign) + { + warn (_("compressed section '%s' is corrupted\n"), + section->name); + return FALSE; + } + uncompressed_size = chdr.ch_size; + start += compression_header_size; + size -= compression_header_size; + } + else if (size > 12 && streq ((char *) start, "ZLIB")) + { + /* Read the zlib header. In this case, it should be "ZLIB" + followed by the uncompressed section size, 8 bytes in + big-endian order. */ + uncompressed_size = start[4]; uncompressed_size <<= 8; + uncompressed_size += start[5]; uncompressed_size <<= 8; + uncompressed_size += start[6]; uncompressed_size <<= 8; + uncompressed_size += start[7]; uncompressed_size <<= 8; + uncompressed_size += start[8]; uncompressed_size <<= 8; + uncompressed_size += start[9]; uncompressed_size <<= 8; + uncompressed_size += start[10]; uncompressed_size <<= 8; + uncompressed_size += start[11]; + start += 12; + size -= 12; + } + + if (uncompressed_size) + { + if (uncompress_section_contents (&start, uncompressed_size, + &size)) + { + /* Free the compressed buffer, update the section buffer + and the section size if uncompress is successful. */ + free (section->start); + section->start = start; + } + else + { + error (_("Unable to decompress section %s\n"), + printable_section_name (sec)); + return FALSE; + } + } + + section->size = size; } if (section->start == NULL) - return 0; + return FALSE; if (debug_displays [debug].relocate) - apply_relocations ((FILE *) file, sec, section->start); + { + if (! apply_relocations ((FILE *) file, sec, section->start, section->size, + & section->reloc_info, & section->num_relocs)) + return FALSE; + } + else + { + section->reloc_info = NULL; + section->num_relocs = 0; + } - return 1; + return TRUE; } /* If this is not NULL, load_debug_section will only look for sections within the list of sections given here. */ -unsigned int *section_subset = NULL; +static unsigned int * section_subset = NULL; -int +bfd_boolean load_debug_section (enum dwarf_section_display_enum debug, void * file) { struct dwarf_section * section = &debug_displays [debug].section; @@ -11048,7 +13245,7 @@ load_debug_section (enum dwarf_section_display_enum debug, void * file) section->name = section->compressed_name; } if (sec == NULL) - return 0; + return FALSE; /* If we're loading from a subset of sections, and we've loaded a section matching this name before, it's likely that it's a @@ -11073,19 +13270,20 @@ free_debug_section (enum dwarf_section_display_enum debug) section->size = 0; } -static int +static bfd_boolean display_debug_section (int shndx, Elf_Internal_Shdr * section, FILE * file) { char * name = SECTION_NAME (section); + const char * print_name = printable_section_name (section); bfd_size_type length; - int result = 1; + bfd_boolean result = TRUE; int i; length = section->sh_size; if (length == 0) { - printf (_("\nSection '%s' has no debugging data.\n"), name); - return 0; + printf (_("\nSection '%s' has no debugging data.\n"), print_name); + return TRUE; } if (section->sh_type == SHT_NOBITS) { @@ -11093,8 +13291,9 @@ display_debug_section (int shndx, Elf_Internal_Shdr * section, FILE * file) which has the NOBITS type - the bits in the file will be random. This can happen when a file containing a .eh_frame section is stripped with the --only-keep-debug command line option. */ - printf (_("section '%s' has the NOBITS type - its contents are unreliable.\n"), name); - return 0; + printf (_("section '%s' has the NOBITS type - its contents are unreliable.\n"), + print_name); + return FALSE; } if (const_strneq (name, ".gnu.linkonce.wi.")) @@ -11138,8 +13337,8 @@ display_debug_section (int shndx, Elf_Internal_Shdr * section, FILE * file) if (i == max) { - printf (_("Unrecognized debug section: %s\n"), name); - result = 0; + printf (_("Unrecognized debug section: %s\n"), print_name); + result = FALSE; } return result; @@ -11156,13 +13355,13 @@ initialise_dumps_byname (void) for (cur = dump_sects_byname; cur; cur = cur->next) { unsigned int i; - int any; + bfd_boolean any = FALSE; - for (i = 0, any = 0; i < elf_header.e_shnum; i++) + for (i = 0; i < elf_header.e_shnum; i++) if (streq (SECTION_NAME (section_headers + i), cur->name)) { request_dump_bynumber (i, cur->type); - any = 1; + any = TRUE; } if (!any) @@ -11171,14 +13370,15 @@ initialise_dumps_byname (void) } } -static void +static bfd_boolean process_section_contents (FILE * file) { Elf_Internal_Shdr * section; unsigned int i; + bfd_boolean res = TRUE; if (! do_dump) - return; + return TRUE; initialise_dumps_byname (); @@ -11191,23 +13391,43 @@ process_section_contents (FILE * file) disassemble_section (section, file); #endif if (dump_sects[i] & HEX_DUMP) - dump_section_as_bytes (section, file, FALSE); + { + if (! dump_section_as_bytes (section, file, FALSE)) + res = FALSE; + } if (dump_sects[i] & RELOC_DUMP) - dump_section_as_bytes (section, file, TRUE); + { + if (! dump_section_as_bytes (section, file, TRUE)) + res = FALSE; + } if (dump_sects[i] & STRING_DUMP) - dump_section_as_strings (section, file); + { + if (! dump_section_as_strings (section, file)) + res = FALSE; + } if (dump_sects[i] & DEBUG_DUMP) - display_debug_section (i, section, file); + { + if (! display_debug_section (i, section, file)) + res = FALSE; + } } /* Check to see if the user requested a dump of a section that does not exist. */ - while (i++ < num_dump_sects) - if (dump_sects[i]) - warn (_("Section %d was not dumped because it does not exist!\n"), i); + while (i < num_dump_sects) + { + if (dump_sects[i]) + { + warn (_("Section %d was not dumped because it does not exist!\n"), i); + res = FALSE; + } + i++; + } + + return res; } static void @@ -11215,15 +13435,16 @@ process_mips_fpe_exception (int mask) { if (mask) { - int first = 1; + bfd_boolean first = TRUE; + if (mask & OEX_FPU_INEX) - fputs ("INEX", stdout), first = 0; + fputs ("INEX", stdout), first = FALSE; if (mask & OEX_FPU_UFLO) - printf ("%sUFLO", first ? "" : "|"), first = 0; + printf ("%sUFLO", first ? "" : "|"), first = FALSE; if (mask & OEX_FPU_OFLO) - printf ("%sOFLO", first ? "" : "|"), first = 0; + printf ("%sOFLO", first ? "" : "|"), first = FALSE; if (mask & OEX_FPU_DIV0) - printf ("%sDIV0", first ? "" : "|"), first = 0; + printf ("%sDIV0", first ? "" : "|"), first = FALSE; if (mask & OEX_FPU_INVAL) printf ("%sINVAL", first ? "" : "|"); } @@ -11246,7 +13467,7 @@ process_mips_fpe_exception (int mask) Reads at or beyond END will not be made. */ static unsigned char * -display_tag_value (int tag, +display_tag_value (signed int tag, unsigned char * p, const unsigned char * const end) { @@ -11257,13 +13478,25 @@ display_tag_value (int tag, if (p >= end) { - warn (_("corrupt tag\n")); + warn (_("\n")); } else if (tag & 1) { - /* FIXME: we could read beyond END here. */ - printf ("\"%s\"\n", p); - p += strlen ((char *) p) + 1; + /* PR 17531 file: 027-19978-0.004. */ + size_t maxlen = (end - p) - 1; + + putchar ('"'); + if (maxlen > 0) + { + print_symbol ((int) maxlen, (const char *) p); + p += strnlen ((char *) p, maxlen) + 1; + } + else + { + printf (_("")); + p = (unsigned char *) end; + } + printf ("\"\n"); } else { @@ -11274,57 +13507,234 @@ display_tag_value (int tag, printf ("%ld (0x%lx)\n", val, val); } + assert (p <= end); return p; } -/* ARM EABI attributes section. */ -typedef struct +/* ARC ABI attributes section. */ + +static unsigned char * +display_arc_attribute (unsigned char * p, + const unsigned char * const end) { - int tag; - const char * name; - /* 0 = special, 1 = string, 2 = uleb123, > 0x80 == table lookup. */ - int type; - const char ** table; -} arm_attr_public_tag; + unsigned int tag; + unsigned int len; + unsigned int val; -static const char * arm_attr_tag_CPU_arch[] = - {"Pre-v4", "v4", "v4T", "v5T", "v5TE", "v5TEJ", "v6", "v6KZ", "v6T2", - "v6K", "v7", "v6-M", "v6S-M", "v7E-M", "v8"}; -static const char * arm_attr_tag_ARM_ISA_use[] = {"No", "Yes"}; -static const char * arm_attr_tag_THUMB_ISA_use[] = - {"No", "Thumb-1", "Thumb-2"}; -static const char * arm_attr_tag_FP_arch[] = - {"No", "VFPv1", "VFPv2", "VFPv3", "VFPv3-D16", "VFPv4", "VFPv4-D16", - "FP for ARMv8"}; -static const char * arm_attr_tag_WMMX_arch[] = {"No", "WMMXv1", "WMMXv2"}; -static const char * arm_attr_tag_Advanced_SIMD_arch[] = - {"No", "NEONv1", "NEONv1 with Fused-MAC", "NEON for ARMv8"}; -static const char * arm_attr_tag_PCS_config[] = - {"None", "Bare platform", "Linux application", "Linux DSO", "PalmOS 2004", - "PalmOS (reserved)", "SymbianOS 2004", "SymbianOS (reserved)"}; -static const char * arm_attr_tag_ABI_PCS_R9_use[] = - {"V6", "SB", "TLS", "Unused"}; -static const char * arm_attr_tag_ABI_PCS_RW_data[] = - {"Absolute", "PC-relative", "SB-relative", "None"}; -static const char * arm_attr_tag_ABI_PCS_RO_data[] = - {"Absolute", "PC-relative", "None"}; -static const char * arm_attr_tag_ABI_PCS_GOT_use[] = - {"None", "direct", "GOT-indirect"}; -static const char * arm_attr_tag_ABI_PCS_wchar_t[] = - {"None", "??? 1", "2", "??? 3", "4"}; -static const char * arm_attr_tag_ABI_FP_rounding[] = {"Unused", "Needed"}; -static const char * arm_attr_tag_ABI_FP_denormal[] = - {"Unused", "Needed", "Sign only"}; -static const char * arm_attr_tag_ABI_FP_exceptions[] = {"Unused", "Needed"}; -static const char * arm_attr_tag_ABI_FP_user_exceptions[] = {"Unused", "Needed"}; -static const char * arm_attr_tag_ABI_FP_number_model[] = - {"Unused", "Finite", "RTABI", "IEEE 754"}; -static const char * arm_attr_tag_ABI_enum_size[] = - {"Unused", "small", "int", "forced to int"}; -static const char * arm_attr_tag_ABI_HardFP_use[] = - {"As Tag_FP_arch", "SP only", "DP only", "SP and DP"}; + tag = read_uleb128 (p, &len, end); + p += len; + + switch (tag) + { + case Tag_ARC_PCS_config: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_PCS_config: "); + switch (val) + { + case 0: + printf (_("Absent/Non standard\n")); + break; + case 1: + printf (_("Bare metal/mwdt\n")); + break; + case 2: + printf (_("Bare metal/newlib\n")); + break; + case 3: + printf (_("Linux/uclibc\n")); + break; + case 4: + printf (_("Linux/glibc\n")); + break; + default: + printf (_("Unknown\n")); + break; + } + break; + + case Tag_ARC_CPU_base: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_CPU_base: "); + switch (val) + { + default: + case TAG_CPU_NONE: + printf (_("Absent\n")); + break; + case TAG_CPU_ARC6xx: + printf ("ARC6xx\n"); + break; + case TAG_CPU_ARC7xx: + printf ("ARC7xx\n"); + break; + case TAG_CPU_ARCEM: + printf ("ARCEM\n"); + break; + case TAG_CPU_ARCHS: + printf ("ARCHS\n"); + break; + } + break; + + case Tag_ARC_CPU_variation: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_CPU_variation: "); + switch (val) + { + default: + if (val > 0 && val < 16) + { + printf ("Core%d\n", val); + break; + } + case 0: + printf (_("Absent\n")); + break; + } + break; + + case Tag_ARC_CPU_name: + printf (" Tag_ARC_CPU_name: "); + p = display_tag_value (-1, p, end); + break; + + case Tag_ARC_ABI_rf16: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_rf16: %s\n", val ? _("yes") : _("no")); + break; + + case Tag_ARC_ABI_osver: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_osver: v%d\n", val); + break; + + case Tag_ARC_ABI_pic: + case Tag_ARC_ABI_sda: + val = read_uleb128 (p, &len, end); + p += len; + printf (tag == Tag_ARC_ABI_sda ? " Tag_ARC_ABI_sda: " + : " Tag_ARC_ABI_pic: "); + switch (val) + { + case 0: + printf (_("Absent\n")); + break; + case 1: + printf ("MWDT\n"); + break; + case 2: + printf ("GNU\n"); + break; + default: + printf (_("Unknown\n")); + break; + } + break; + + case Tag_ARC_ABI_tls: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_tls: %s\n", val ? "r25": "none"); + break; + + case Tag_ARC_ABI_enumsize: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_enumsize: %s\n", val ? _("default") : + _("smallest")); + break; + + case Tag_ARC_ABI_exceptions: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_exceptions: %s\n", val ? _("OPTFP") + : _("default")); + break; + + case Tag_ARC_ABI_double_size: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_double_size: %d\n", val); + break; + + case Tag_ARC_ISA_config: + printf (" Tag_ARC_ISA_config: "); + p = display_tag_value (-1, p, end); + break; + + case Tag_ARC_ISA_apex: + printf (" Tag_ARC_ISA_apex: "); + p = display_tag_value (-1, p, end); + break; + + case Tag_ARC_ISA_mpy_option: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ISA_mpy_option: %d\n", val); + break; + + default: + return display_tag_value (tag & 1, p, end); + } + + return p; +} + +/* ARM EABI attributes section. */ +typedef struct +{ + unsigned int tag; + const char * name; + /* 0 = special, 1 = string, 2 = uleb123, > 0x80 == table lookup. */ + unsigned int type; + const char ** table; +} arm_attr_public_tag; + +static const char * arm_attr_tag_CPU_arch[] = + {"Pre-v4", "v4", "v4T", "v5T", "v5TE", "v5TEJ", "v6", "v6KZ", "v6T2", + "v6K", "v7", "v6-M", "v6S-M", "v7E-M", "v8", "", "v8-M.baseline", + "v8-M.mainline"}; +static const char * arm_attr_tag_ARM_ISA_use[] = {"No", "Yes"}; +static const char * arm_attr_tag_THUMB_ISA_use[] = + {"No", "Thumb-1", "Thumb-2", "Yes"}; +static const char * arm_attr_tag_FP_arch[] = + {"No", "VFPv1", "VFPv2", "VFPv3", "VFPv3-D16", "VFPv4", "VFPv4-D16", + "FP for ARMv8", "FPv5/FP-D16 for ARMv8"}; +static const char * arm_attr_tag_WMMX_arch[] = {"No", "WMMXv1", "WMMXv2"}; +static const char * arm_attr_tag_Advanced_SIMD_arch[] = + {"No", "NEONv1", "NEONv1 with Fused-MAC", "NEON for ARMv8", + "NEON for ARMv8.1"}; +static const char * arm_attr_tag_PCS_config[] = + {"None", "Bare platform", "Linux application", "Linux DSO", "PalmOS 2004", + "PalmOS (reserved)", "SymbianOS 2004", "SymbianOS (reserved)"}; +static const char * arm_attr_tag_ABI_PCS_R9_use[] = + {"V6", "SB", "TLS", "Unused"}; +static const char * arm_attr_tag_ABI_PCS_RW_data[] = + {"Absolute", "PC-relative", "SB-relative", "None"}; +static const char * arm_attr_tag_ABI_PCS_RO_data[] = + {"Absolute", "PC-relative", "None"}; +static const char * arm_attr_tag_ABI_PCS_GOT_use[] = + {"None", "direct", "GOT-indirect"}; +static const char * arm_attr_tag_ABI_PCS_wchar_t[] = + {"None", "??? 1", "2", "??? 3", "4"}; +static const char * arm_attr_tag_ABI_FP_rounding[] = {"Unused", "Needed"}; +static const char * arm_attr_tag_ABI_FP_denormal[] = + {"Unused", "Needed", "Sign only"}; +static const char * arm_attr_tag_ABI_FP_exceptions[] = {"Unused", "Needed"}; +static const char * arm_attr_tag_ABI_FP_user_exceptions[] = {"Unused", "Needed"}; +static const char * arm_attr_tag_ABI_FP_number_model[] = + {"Unused", "Finite", "RTABI", "IEEE 754"}; +static const char * arm_attr_tag_ABI_enum_size[] = + {"Unused", "small", "int", "forced to int"}; +static const char * arm_attr_tag_ABI_HardFP_use[] = + {"As Tag_FP_arch", "SP only", "Reserved", "Deprecated"}; static const char * arm_attr_tag_ABI_VFP_args[] = - {"AAPCS", "VFP registers", "custom"}; + {"AAPCS", "VFP registers", "custom", "compatible"}; static const char * arm_attr_tag_ABI_WMMX_args[] = {"AAPCS", "WMMX registers", "custom"}; static const char * arm_attr_tag_ABI_optimization_goals[] = @@ -11338,6 +13748,8 @@ static const char * arm_attr_tag_FP_HP_extension[] = {"Not Allowed", "Allowed"}; static const char * arm_attr_tag_ABI_FP_16bit_format[] = {"None", "IEEE 754", "Alternative Format"}; +static const char * arm_attr_tag_DSP_extension[] = + {"Follow architecture", "Allowed"}; static const char * arm_attr_tag_MPextension_use[] = {"Not Allowed", "Allowed"}; static const char * arm_attr_tag_DIV_use[] = @@ -11388,6 +13800,7 @@ static arm_attr_public_tag arm_attr_public_tags[] = LOOKUP(38, ABI_FP_16bit_format), LOOKUP(42, MPextension_use), LOOKUP(44, DIV_use), + LOOKUP(46, DSP_extension), {64, "nodefaults", 0, NULL}, {65, "also_compatible_with", 0, NULL}, LOOKUP(66, T2EE_use), @@ -11401,12 +13814,12 @@ static unsigned char * display_arm_attribute (unsigned char * p, const unsigned char * const end) { - int tag; + unsigned int tag; unsigned int len; - int val; + unsigned int val; arm_attr_public_tag * attr; unsigned i; - int type; + unsigned int type; tag = read_uleb128 (p, &len, end); p += len; @@ -11481,14 +13894,30 @@ display_arm_attribute (unsigned char * p, break; case 32: /* Tag_compatibility. */ - val = read_uleb128 (p, &len, end); - p += len; - printf (_("flag = %d, vendor = %s\n"), val, p); - p += strlen ((char *) p) + 1; + { + val = read_uleb128 (p, &len, end); + p += len; + printf (_("flag = %d, vendor = "), val); + if (p < end - 1) + { + size_t maxlen = (end - p) - 1; + + print_symbol ((int) maxlen, (const char *) p); + p += strnlen ((char *) p, maxlen) + 1; + } + else + { + printf (_("")); + p = (unsigned char *) end; + } + putchar ('\n'); + } break; case 64: /* Tag_nodefaults. */ - p++; + /* PR 17531: file: 001-505008-0.01. */ + if (p < end) + p++; printf (_("True\n")); break; @@ -11499,18 +13928,20 @@ display_arm_attribute (unsigned char * p, { val = read_uleb128 (p, &len, end); p += len; - if ((unsigned int)val >= ARRAY_SIZE (arm_attr_tag_CPU_arch)) + if ((unsigned int) val >= ARRAY_SIZE (arm_attr_tag_CPU_arch)) printf ("??? (%d)\n", val); else printf ("%s\n", arm_attr_tag_CPU_arch[val]); } else printf ("???\n"); - while (*(p++) != '\0' /* NUL terminator. */); + while (p < end && *(p++) != '\0' /* NUL terminator. */) + ; break; default: - abort (); + printf (_("\n"), tag); + break; } return p; @@ -11537,12 +13968,12 @@ display_arm_attribute (unsigned char * p, static unsigned char * display_gnu_attribute (unsigned char * p, - unsigned char * (* display_proc_gnu_attribute) (unsigned char *, int, const unsigned char * const), + unsigned char * (* display_proc_gnu_attribute) (unsigned char *, unsigned int, const unsigned char * const), const unsigned char * const end) { int tag; unsigned int len; - int val; + unsigned int val; tag = read_uleb128 (p, &len, end); p += len; @@ -11553,15 +13984,28 @@ display_gnu_attribute (unsigned char * p, { val = read_uleb128 (p, &len, end); p += len; + + printf (_("flag = %d, vendor = "), val); if (p == end) { - printf (_("flag = %d, vendor = \n"), val); + printf (_("\n")); warn (_("corrupt vendor attribute\n")); } else { - printf (_("flag = %d, vendor = %s\n"), val, p); - p += strlen ((char *) p) + 1; + if (p < end - 1) + { + size_t maxlen = (end - p) - 1; + + print_symbol ((int) maxlen, (const char *) p); + p += strnlen ((char *) p, maxlen) + 1; + } + else + { + printf (_("")); + p = (unsigned char *) end; + } + putchar ('\n'); } return p; } @@ -11574,51 +14018,81 @@ display_gnu_attribute (unsigned char * p, static unsigned char * display_power_gnu_attribute (unsigned char * p, - int tag, + unsigned int tag, const unsigned char * const end) { unsigned int len; - int val; + unsigned int val; if (tag == Tag_GNU_Power_ABI_FP) { val = read_uleb128 (p, &len, end); p += len; printf (" Tag_GNU_Power_ABI_FP: "); + if (len == 0) + { + printf (_("\n")); + return p; + } - switch (val) + if (val > 15) + printf ("(%#x), ", val); + + switch (val & 3) { case 0: - printf (_("Hard or soft float\n")); + printf (_("unspecified hard/soft float, ")); break; case 1: - printf (_("Hard float\n")); + printf (_("hard float, ")); break; case 2: - printf (_("Soft float\n")); + printf (_("soft float, ")); break; case 3: - printf (_("Single-precision hard float\n")); + printf (_("single-precision hard float, ")); break; - default: - printf ("??? (%d)\n", val); + } + + switch (val & 0xC) + { + case 0: + printf (_("unspecified long double\n")); + break; + case 4: + printf (_("128-bit IBM long double\n")); + break; + case 8: + printf (_("64-bit long double\n")); + break; + case 12: + printf (_("128-bit IEEE long double\n")); break; } return p; - } + } if (tag == Tag_GNU_Power_ABI_Vector) { val = read_uleb128 (p, &len, end); p += len; printf (" Tag_GNU_Power_ABI_Vector: "); - switch (val) + if (len == 0) + { + printf (_("\n")); + return p; + } + + if (val > 3) + printf ("(%#x), ", val); + + switch (val & 3) { case 0: - printf (_("Any\n")); + printf (_("unspecified\n")); break; case 1: - printf (_("Generic\n")); + printf (_("generic\n")); break; case 2: printf ("AltiVec\n"); @@ -11626,146 +14100,268 @@ display_power_gnu_attribute (unsigned char * p, case 3: printf ("SPE\n"); break; - default: - printf ("??? (%d)\n", val); - break; } return p; - } + } if (tag == Tag_GNU_Power_ABI_Struct_Return) { - if (p == end) + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_GNU_Power_ABI_Struct_Return: "); + if (len == 0) { - warn (_("corrupt Tag_GNU_Power_ABI_Struct_Return")); + printf (_("\n")); return p; } - + + if (val > 2) + printf ("(%#x), ", val); + + switch (val & 3) + { + case 0: + printf (_("unspecified\n")); + break; + case 1: + printf ("r3/r4\n"); + break; + case 2: + printf (_("memory\n")); + break; + case 3: + printf ("???\n"); + break; + } + return p; + } + + return display_tag_value (tag & 1, p, end); +} + +static unsigned char * +display_s390_gnu_attribute (unsigned char * p, + unsigned int tag, + const unsigned char * const end) +{ + unsigned int len; + int val; + + if (tag == Tag_GNU_S390_ABI_Vector) + { val = read_uleb128 (p, &len, end); p += len; - printf (" Tag_GNU_Power_ABI_Struct_Return: "); + printf (" Tag_GNU_S390_ABI_Vector: "); + switch (val) - { - case 0: - printf (_("Any\n")); - break; - case 1: - printf ("r3/r4\n"); - break; - case 2: - printf (_("Memory\n")); - break; - default: - printf ("??? (%d)\n", val); - break; - } + { + case 0: + printf (_("any\n")); + break; + case 1: + printf (_("software\n")); + break; + case 2: + printf (_("hardware\n")); + break; + default: + printf ("??? (%d)\n", val); + break; + } return p; - } + } return display_tag_value (tag & 1, p, end); } static void -display_sparc_hwcaps (int mask) +display_sparc_hwcaps (unsigned int mask) { if (mask) { - int first = 1; + bfd_boolean first = TRUE; + if (mask & ELF_SPARC_HWCAP_MUL32) - fputs ("mul32", stdout), first = 0; + fputs ("mul32", stdout), first = FALSE; if (mask & ELF_SPARC_HWCAP_DIV32) - printf ("%sdiv32", first ? "" : "|"), first = 0; + printf ("%sdiv32", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_FSMULD) - printf ("%sfsmuld", first ? "" : "|"), first = 0; + printf ("%sfsmuld", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_V8PLUS) - printf ("%sv8plus", first ? "" : "|"), first = 0; + printf ("%sv8plus", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_POPC) - printf ("%spopc", first ? "" : "|"), first = 0; + printf ("%spopc", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_VIS) - printf ("%svis", first ? "" : "|"), first = 0; + printf ("%svis", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_VIS2) - printf ("%svis2", first ? "" : "|"), first = 0; + printf ("%svis2", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_ASI_BLK_INIT) - printf ("%sASIBlkInit", first ? "" : "|"), first = 0; + printf ("%sASIBlkInit", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_FMAF) - printf ("%sfmaf", first ? "" : "|"), first = 0; + printf ("%sfmaf", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_VIS3) - printf ("%svis3", first ? "" : "|"), first = 0; + printf ("%svis3", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_HPC) - printf ("%shpc", first ? "" : "|"), first = 0; + printf ("%shpc", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_RANDOM) - printf ("%srandom", first ? "" : "|"), first = 0; + printf ("%srandom", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_TRANS) - printf ("%strans", first ? "" : "|"), first = 0; + printf ("%strans", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_FJFMAU) - printf ("%sfjfmau", first ? "" : "|"), first = 0; + printf ("%sfjfmau", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_IMA) - printf ("%sima", first ? "" : "|"), first = 0; + printf ("%sima", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_ASI_CACHE_SPARING) - printf ("%scspare", first ? "" : "|"), first = 0; + printf ("%scspare", first ? "" : "|"), first = FALSE; + } + else + fputc ('0', stdout); + fputc ('\n', stdout); +} + +static void +display_sparc_hwcaps2 (unsigned int mask) +{ + if (mask) + { + bfd_boolean first = TRUE; + + if (mask & ELF_SPARC_HWCAP2_FJATHPLUS) + fputs ("fjathplus", stdout), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_VIS3B) + printf ("%svis3b", first ? "" : "|"), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_ADP) + printf ("%sadp", first ? "" : "|"), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_SPARC5) + printf ("%ssparc5", first ? "" : "|"), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_MWAIT) + printf ("%smwait", first ? "" : "|"), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_XMPMUL) + printf ("%sxmpmul", first ? "" : "|"), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_XMONT) + printf ("%sxmont2", first ? "" : "|"), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_NSEC) + printf ("%snsec", first ? "" : "|"), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_FJATHHPC) + printf ("%sfjathhpc", first ? "" : "|"), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_FJDES) + printf ("%sfjdes", first ? "" : "|"), first = FALSE; + if (mask & ELF_SPARC_HWCAP2_FJAES) + printf ("%sfjaes", first ? "" : "|"), first = FALSE; } else - fputc('0', stdout); - fputc('\n', stdout); + fputc ('0', stdout); + fputc ('\n', stdout); } static unsigned char * display_sparc_gnu_attribute (unsigned char * p, - int tag, + unsigned int tag, const unsigned char * const end) { + unsigned int len; + int val; + if (tag == Tag_GNU_Sparc_HWCAPS) { - unsigned int len; - int val; - val = read_uleb128 (p, &len, end); p += len; printf (" Tag_GNU_Sparc_HWCAPS: "); display_sparc_hwcaps (val); return p; - } - - return display_tag_value (tag, p, end); -} + } + if (tag == Tag_GNU_Sparc_HWCAPS2) + { + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_GNU_Sparc_HWCAPS2: "); + display_sparc_hwcaps2 (val); + return p; + } + + return display_tag_value (tag, p, end); +} + +static void +print_mips_fp_abi_value (unsigned int val) +{ + switch (val) + { + case Val_GNU_MIPS_ABI_FP_ANY: + printf (_("Hard or soft float\n")); + break; + case Val_GNU_MIPS_ABI_FP_DOUBLE: + printf (_("Hard float (double precision)\n")); + break; + case Val_GNU_MIPS_ABI_FP_SINGLE: + printf (_("Hard float (single precision)\n")); + break; + case Val_GNU_MIPS_ABI_FP_SOFT: + printf (_("Soft float\n")); + break; + case Val_GNU_MIPS_ABI_FP_OLD_64: + printf (_("Hard float (MIPS32r2 64-bit FPU 12 callee-saved)\n")); + break; + case Val_GNU_MIPS_ABI_FP_XX: + printf (_("Hard float (32-bit CPU, Any FPU)\n")); + break; + case Val_GNU_MIPS_ABI_FP_64: + printf (_("Hard float (32-bit CPU, 64-bit FPU)\n")); + break; + case Val_GNU_MIPS_ABI_FP_64A: + printf (_("Hard float compat (32-bit CPU, 64-bit FPU)\n")); + break; + case Val_GNU_MIPS_ABI_FP_NAN2008: + printf (_("NaN 2008 compatibility\n")); + break; + default: + printf ("??? (%d)\n", val); + break; + } +} static unsigned char * display_mips_gnu_attribute (unsigned char * p, - int tag, + unsigned int tag, const unsigned char * const end) { if (tag == Tag_GNU_MIPS_ABI_FP) { unsigned int len; - int val; + unsigned int val; val = read_uleb128 (p, &len, end); p += len; printf (" Tag_GNU_MIPS_ABI_FP: "); + print_mips_fp_abi_value (val); + + return p; + } + + if (tag == Tag_GNU_MIPS_ABI_MSA) + { + unsigned int len; + unsigned int val; + + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_GNU_MIPS_ABI_MSA: "); + switch (val) { - case Val_GNU_MIPS_ABI_FP_ANY: - printf (_("Hard or soft float\n")); + case Val_GNU_MIPS_ABI_MSA_ANY: + printf (_("Any MSA or not\n")); break; - case Val_GNU_MIPS_ABI_FP_DOUBLE: - printf (_("Hard float (double precision)\n")); - break; - case Val_GNU_MIPS_ABI_FP_SINGLE: - printf (_("Hard float (single precision)\n")); - break; - case Val_GNU_MIPS_ABI_FP_SOFT: - printf (_("Soft float\n")); - break; - case Val_GNU_MIPS_ABI_FP_64: - printf (_("Hard float (MIPS32r2 64-bit FPU)\n")); + case Val_GNU_MIPS_ABI_MSA_128: + printf (_("128-bit MSA\n")); break; default: printf ("??? (%d)\n", val); break; } return p; - } + } return display_tag_value (tag & 1, p, end); } @@ -11774,7 +14370,7 @@ static unsigned char * display_tic6x_attribute (unsigned char * p, const unsigned char * const end) { - int tag; + unsigned int tag; unsigned int len; int val; @@ -11974,29 +14570,57 @@ display_tic6x_attribute (unsigned char * p, return p; case Tag_ABI_compatibility: - val = read_uleb128 (p, &len, end); - p += len; - printf (" Tag_ABI_compatibility: "); - printf (_("flag = %d, vendor = %s\n"), val, p); - p += strlen ((char *) p) + 1; - return p; + { + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ABI_compatibility: "); + printf (_("flag = %d, vendor = "), val); + if (p < end - 1) + { + size_t maxlen = (end - p) - 1; + + print_symbol ((int) maxlen, (const char *) p); + p += strnlen ((char *) p, maxlen) + 1; + } + else + { + printf (_("")); + p = (unsigned char *) end; + } + putchar ('\n'); + return p; + } case Tag_ABI_conformance: - printf (" Tag_ABI_conformance: "); - printf ("\"%s\"\n", p); - p += strlen ((char *) p) + 1; - return p; + { + printf (" Tag_ABI_conformance: \""); + if (p < end - 1) + { + size_t maxlen = (end - p) - 1; + + print_symbol ((int) maxlen, (const char *) p); + p += strnlen ((char *) p, maxlen) + 1; + } + else + { + printf (_("")); + p = (unsigned char *) end; + } + printf ("\"\n"); + return p; + } } return display_tag_value (tag, p, end); } static void -display_raw_attribute (unsigned char * p, unsigned char * end) +display_raw_attribute (unsigned char * p, unsigned char const * const end) { unsigned long addr = 0; size_t bytes = end - p; + assert (end > p); while (bytes) { int j; @@ -12040,12 +14664,12 @@ display_msp430x_attribute (unsigned char * p, const unsigned char * const end) { unsigned int len; - int val; - int tag; + unsigned int val; + unsigned int tag; tag = read_uleb128 (p, & len, end); p += len; - + switch (tag) { case OFBA_MSPABI_Tag_ISA: @@ -12093,8 +14717,20 @@ display_msp430x_attribute (unsigned char * p, if (tag & 1) { - printf ("\"%s\"\n", p); - p += strlen ((char *) p) + 1; + putchar ('"'); + if (p < end - 1) + { + size_t maxlen = (end - p) - 1; + + print_symbol ((int) maxlen, (const char *) p); + p += strnlen ((char *) p, maxlen) + 1; + } + else + { + printf (_("")); + p = (unsigned char *) end; + } + printf ("\"\n"); } else { @@ -12105,61 +14741,100 @@ display_msp430x_attribute (unsigned char * p, break; } + assert (p <= end); return p; } -static int +static bfd_boolean process_attributes (FILE * file, const char * public_name, unsigned int proc_type, unsigned char * (* display_pub_attribute) (unsigned char *, const unsigned char * const), - unsigned char * (* display_proc_gnu_attribute) (unsigned char *, int, const unsigned char * const)) + unsigned char * (* display_proc_gnu_attribute) (unsigned char *, unsigned int, const unsigned char * const)) { Elf_Internal_Shdr * sect; - unsigned char * contents; - unsigned char * p; - unsigned char * end; - bfd_vma section_len; - bfd_vma len; unsigned i; + bfd_boolean res = TRUE; /* Find the section header so that we get the size. */ for (i = 0, sect = section_headers; i < elf_header.e_shnum; i++, sect++) { + unsigned char * contents; + unsigned char * p; + if (sect->sh_type != proc_type && sect->sh_type != SHT_GNU_ATTRIBUTES) continue; contents = (unsigned char *) get_data (NULL, file, sect->sh_offset, 1, sect->sh_size, _("attributes")); if (contents == NULL) - continue; + { + res = FALSE; + continue; + } p = contents; - if (*p == 'A') + /* The first character is the version of the attributes. + Currently only version 1, (aka 'A') is recognised here. */ + if (*p != 'A') + { + printf (_("Unknown attributes version '%c'(%d) - expecting 'A'\n"), *p, *p); + res = FALSE; + } + else { - len = sect->sh_size - 1; + bfd_vma section_len; + + section_len = sect->sh_size - 1; p++; - while (len > 0) + while (section_len > 0) { - int namelen; + bfd_vma attr_len; + unsigned int namelen; bfd_boolean public_section; bfd_boolean gnu_section; - section_len = byte_get (p, 4); + if (section_len <= 4) + { + error (_("Tag section ends prematurely\n")); + res = FALSE; + break; + } + attr_len = byte_get (p, 4); p += 4; - if (section_len > len) + if (attr_len > section_len) + { + error (_("Bad attribute length (%u > %u)\n"), + (unsigned) attr_len, (unsigned) section_len); + attr_len = section_len; + res = FALSE; + } + /* PR 17531: file: 001-101425-0.004 */ + else if (attr_len < 5) + { + error (_("Attribute length of %u is too small\n"), (unsigned) attr_len); + res = FALSE; + break; + } + + section_len -= attr_len; + attr_len -= 4; + + namelen = strnlen ((char *) p, attr_len) + 1; + if (namelen == 0 || namelen >= attr_len) { - printf (_("ERROR: Bad section length (%d > %d)\n"), - (int) section_len, (int) len); - section_len = len; + error (_("Corrupt attribute section name\n")); + res = FALSE; + break; } - len -= section_len; - printf (_("Attribute Section: %s\n"), p); + printf (_("Attribute Section: ")); + print_symbol (INT_MAX, (const char *) p); + putchar ('\n'); if (public_name && streq ((char *) p, public_name)) public_section = TRUE; @@ -12171,26 +14846,47 @@ process_attributes (FILE * file, else gnu_section = FALSE; - namelen = strlen ((char *) p) + 1; p += namelen; - section_len -= namelen + 4; + attr_len -= namelen; - while (section_len > 0) + while (attr_len > 0 && p < contents + sect->sh_size) { - int tag = *(p++); + int tag; int val; bfd_vma size; + unsigned char * end; + + /* PR binutils/17531: Safe handling of corrupt files. */ + if (attr_len < 6) + { + error (_("Unused bytes at end of section\n")); + res = FALSE; + section_len = 0; + break; + } + tag = *(p++); size = byte_get (p, 4); - if (size > section_len) + if (size > attr_len) + { + error (_("Bad subsection length (%u > %u)\n"), + (unsigned) size, (unsigned) attr_len); + res = FALSE; + size = attr_len; + } + /* PR binutils/17531: Safe handling of corrupt files. */ + if (size < 6) { - printf (_("ERROR: Bad subsection length (%d > %d)\n"), - (int) size, (int) section_len); - size = section_len; + error (_("Bad subsection length (%u < 6)\n"), + (unsigned) size); + res = FALSE; + section_len = 0; + break; } - section_len -= size; + attr_len -= size; end = p + size - 1; + assert (end <= contents + sect->sh_size); p += 4; switch (tag) @@ -12203,6 +14899,7 @@ process_attributes (FILE * file, goto do_numlist; case 3: printf (_("Symbol Attributes:")); + /* Fall through. */ do_numlist: for (;;) { @@ -12222,76 +14919,46 @@ process_attributes (FILE * file, break; } - if (public_section) + if (public_section && display_pub_attribute != NULL) { while (p < end) p = display_pub_attribute (p, end); + assert (p == end); } - else if (gnu_section) + else if (gnu_section && display_proc_gnu_attribute != NULL) { while (p < end) p = display_gnu_attribute (p, display_proc_gnu_attribute, end); + assert (p == end); } - else + else if (p < end) { - printf (_(" Unknown section contexts\n")); + printf (_(" Unknown attribute:\n")); display_raw_attribute (p, end); p = end; } + else + attr_len = 0; } } } - else - printf (_("Unknown format '%c'\n"), *p); free (contents); } - return 1; -} - -static int -process_arm_specific (FILE * file) -{ - return process_attributes (file, "aeabi", SHT_ARM_ATTRIBUTES, - display_arm_attribute, NULL); -} - -static int -process_power_specific (FILE * file) -{ - return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, - display_power_gnu_attribute); -} - -static int -process_sparc_specific (FILE * file) -{ - return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, - display_sparc_gnu_attribute); -} - -static int -process_tic6x_specific (FILE * file) -{ - return process_attributes (file, "c6xabi", SHT_C6000_ATTRIBUTES, - display_tic6x_attribute, NULL); -} -static int -process_msp430x_specific (FILE * file) -{ - return process_attributes (file, "mspabi", SHT_MSP430_ATTRIBUTES, - display_msp430x_attribute, NULL); + return res; } /* DATA points to the contents of a MIPS GOT that starts at VMA PLTGOT. Print the Address, Access and Initial fields of an entry at VMA ADDR - and return the VMA of the next entry. */ + and return the VMA of the next entry, or -1 if there was a problem. + Does not read from DATA_END or beyond. */ static bfd_vma -print_mips_got_entry (unsigned char * data, bfd_vma pltgot, bfd_vma addr) +print_mips_got_entry (unsigned char * data, bfd_vma pltgot, bfd_vma addr, + unsigned char * data_end) { printf (" "); print_vma (addr, LONG_HEX); @@ -12306,9 +14973,19 @@ print_mips_got_entry (unsigned char * data, bfd_vma pltgot, bfd_vma addr) else { bfd_vma entry; + unsigned char * from = data + addr - pltgot; - entry = byte_get (data + addr - pltgot, is_32bit_elf ? 4 : 8); - print_vma (entry, LONG_HEX); + if (from + (is_32bit_elf ? 4 : 8) > data_end) + { + warn (_("MIPS GOT entry extends beyond the end of available data\n")); + printf ("%*s", is_32bit_elf ? 8 : 16, _("")); + return (bfd_vma) -1; + } + else + { + entry = byte_get (data + addr - pltgot, is_32bit_elf ? 4 : 8); + print_vma (entry, LONG_HEX); + } } return addr + (is_32bit_elf ? 4 : 8); } @@ -12335,10 +15012,130 @@ print_mips_pltgot_entry (unsigned char * data, bfd_vma pltgot, bfd_vma addr) return addr + (is_32bit_elf ? 4 : 8); } -static int +static void +print_mips_ases (unsigned int mask) +{ + if (mask & AFL_ASE_DSP) + fputs ("\n\tDSP ASE", stdout); + if (mask & AFL_ASE_DSPR2) + fputs ("\n\tDSP R2 ASE", stdout); + if (mask & AFL_ASE_DSPR3) + fputs ("\n\tDSP R3 ASE", stdout); + if (mask & AFL_ASE_EVA) + fputs ("\n\tEnhanced VA Scheme", stdout); + if (mask & AFL_ASE_MCU) + fputs ("\n\tMCU (MicroController) ASE", stdout); + if (mask & AFL_ASE_MDMX) + fputs ("\n\tMDMX ASE", stdout); + if (mask & AFL_ASE_MIPS3D) + fputs ("\n\tMIPS-3D ASE", stdout); + if (mask & AFL_ASE_MT) + fputs ("\n\tMT ASE", stdout); + if (mask & AFL_ASE_SMARTMIPS) + fputs ("\n\tSmartMIPS ASE", stdout); + if (mask & AFL_ASE_VIRT) + fputs ("\n\tVZ ASE", stdout); + if (mask & AFL_ASE_MSA) + fputs ("\n\tMSA ASE", stdout); + if (mask & AFL_ASE_MIPS16) + fputs ("\n\tMIPS16 ASE", stdout); + if (mask & AFL_ASE_MICROMIPS) + fputs ("\n\tMICROMIPS ASE", stdout); + if (mask & AFL_ASE_XPA) + fputs ("\n\tXPA ASE", stdout); + if (mask & AFL_ASE_MIPS16E2) + fputs ("\n\tMIPS16e2 ASE", stdout); + if (mask == 0) + fprintf (stdout, "\n\t%s", _("None")); + else if ((mask & ~AFL_ASE_MASK) != 0) + fprintf (stdout, "\n\t%s (%x)", _("Unknown"), mask & ~AFL_ASE_MASK); +} + +static void +print_mips_isa_ext (unsigned int isa_ext) +{ + switch (isa_ext) + { + case 0: + fputs (_("None"), stdout); + break; + case AFL_EXT_XLR: + fputs ("RMI XLR", stdout); + break; + case AFL_EXT_OCTEON3: + fputs ("Cavium Networks Octeon3", stdout); + break; + case AFL_EXT_OCTEON2: + fputs ("Cavium Networks Octeon2", stdout); + break; + case AFL_EXT_OCTEONP: + fputs ("Cavium Networks OcteonP", stdout); + break; + case AFL_EXT_LOONGSON_3A: + fputs ("Loongson 3A", stdout); + break; + case AFL_EXT_OCTEON: + fputs ("Cavium Networks Octeon", stdout); + break; + case AFL_EXT_5900: + fputs ("Toshiba R5900", stdout); + break; + case AFL_EXT_4650: + fputs ("MIPS R4650", stdout); + break; + case AFL_EXT_4010: + fputs ("LSI R4010", stdout); + break; + case AFL_EXT_4100: + fputs ("NEC VR4100", stdout); + break; + case AFL_EXT_3900: + fputs ("Toshiba R3900", stdout); + break; + case AFL_EXT_10000: + fputs ("MIPS R10000", stdout); + break; + case AFL_EXT_SB1: + fputs ("Broadcom SB-1", stdout); + break; + case AFL_EXT_4111: + fputs ("NEC VR4111/VR4181", stdout); + break; + case AFL_EXT_4120: + fputs ("NEC VR4120", stdout); + break; + case AFL_EXT_5400: + fputs ("NEC VR5400", stdout); + break; + case AFL_EXT_5500: + fputs ("NEC VR5500", stdout); + break; + case AFL_EXT_LOONGSON_2E: + fputs ("ST Microelectronics Loongson 2E", stdout); + break; + case AFL_EXT_LOONGSON_2F: + fputs ("ST Microelectronics Loongson 2F", stdout); + break; + default: + fprintf (stdout, "%s (%d)", _("Unknown"), isa_ext); + } +} + +static signed int +get_mips_reg_size (int reg_size) +{ + return (reg_size == AFL_REG_NONE) ? 0 + : (reg_size == AFL_REG_32) ? 32 + : (reg_size == AFL_REG_64) ? 64 + : (reg_size == AFL_REG_128) ? 128 + : -1; +} + +static bfd_boolean process_mips_specific (FILE * file) { Elf_Internal_Dyn * entry; + Elf_Internal_Shdr *sect = NULL; size_t liblist_offset = 0; size_t liblistno = 0; size_t conflictsno = 0; @@ -12352,16 +15149,160 @@ process_mips_specific (FILE * file) bfd_vma local_gotno = 0; bfd_vma gotsym = 0; bfd_vma symtabno = 0; + bfd_boolean res = TRUE; + + if (! process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, + display_mips_gnu_attribute)) + res = FALSE; + + sect = find_section (".MIPS.abiflags"); + + if (sect != NULL) + { + Elf_External_ABIFlags_v0 *abiflags_ext; + Elf_Internal_ABIFlags_v0 abiflags_in; - process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, - display_mips_gnu_attribute); + if (sizeof (Elf_External_ABIFlags_v0) != sect->sh_size) + { + error (_("Corrupt MIPS ABI Flags section.\n")); + res = FALSE; + } + else + { + abiflags_ext = get_data (NULL, file, sect->sh_offset, 1, + sect->sh_size, _("MIPS ABI Flags section")); + if (abiflags_ext) + { + abiflags_in.version = BYTE_GET (abiflags_ext->version); + abiflags_in.isa_level = BYTE_GET (abiflags_ext->isa_level); + abiflags_in.isa_rev = BYTE_GET (abiflags_ext->isa_rev); + abiflags_in.gpr_size = BYTE_GET (abiflags_ext->gpr_size); + abiflags_in.cpr1_size = BYTE_GET (abiflags_ext->cpr1_size); + abiflags_in.cpr2_size = BYTE_GET (abiflags_ext->cpr2_size); + abiflags_in.fp_abi = BYTE_GET (abiflags_ext->fp_abi); + abiflags_in.isa_ext = BYTE_GET (abiflags_ext->isa_ext); + abiflags_in.ases = BYTE_GET (abiflags_ext->ases); + abiflags_in.flags1 = BYTE_GET (abiflags_ext->flags1); + abiflags_in.flags2 = BYTE_GET (abiflags_ext->flags2); + + printf ("\nMIPS ABI Flags Version: %d\n", abiflags_in.version); + printf ("\nISA: MIPS%d", abiflags_in.isa_level); + if (abiflags_in.isa_rev > 1) + printf ("r%d", abiflags_in.isa_rev); + printf ("\nGPR size: %d", + get_mips_reg_size (abiflags_in.gpr_size)); + printf ("\nCPR1 size: %d", + get_mips_reg_size (abiflags_in.cpr1_size)); + printf ("\nCPR2 size: %d", + get_mips_reg_size (abiflags_in.cpr2_size)); + fputs ("\nFP ABI: ", stdout); + print_mips_fp_abi_value (abiflags_in.fp_abi); + fputs ("ISA Extension: ", stdout); + print_mips_isa_ext (abiflags_in.isa_ext); + fputs ("\nASEs:", stdout); + print_mips_ases (abiflags_in.ases); + printf ("\nFLAGS 1: %8.8lx", abiflags_in.flags1); + printf ("\nFLAGS 2: %8.8lx", abiflags_in.flags2); + fputc ('\n', stdout); + free (abiflags_ext); + } + } + } /* We have a lot of special sections. Thanks SGI! */ if (dynamic_section == NULL) - /* No information available. */ - return 0; + { + /* No dynamic information available. See if there is static GOT. */ + sect = find_section (".got"); + if (sect != NULL) + { + unsigned char *data_end; + unsigned char *data; + bfd_vma ent, end; + int addr_size; + + pltgot = sect->sh_addr; + + ent = pltgot; + addr_size = (is_32bit_elf ? 4 : 8); + end = pltgot + sect->sh_size; + + data = (unsigned char *) get_data (NULL, file, sect->sh_offset, + end - pltgot, 1, + _("Global Offset Table data")); + /* PR 12855: Null data is handled gracefully throughout. */ + data_end = data + (end - pltgot); + + printf (_("\nStatic GOT:\n")); + printf (_(" Canonical gp value: ")); + print_vma (ent + 0x7ff0, LONG_HEX); + printf ("\n\n"); + + /* In a dynamic binary GOT[0] is reserved for the dynamic + loader to store the lazy resolver pointer, however in + a static binary it may well have been omitted and GOT + reduced to a table of addresses. + PR 21344: Check for the entry being fully available + before fetching it. */ + if (data + && data + ent - pltgot + addr_size <= data_end + && byte_get (data + ent - pltgot, addr_size) == 0) + { + printf (_(" Reserved entries:\n")); + printf (_(" %*s %10s %*s\n"), + addr_size * 2, _("Address"), _("Access"), + addr_size * 2, _("Value")); + ent = print_mips_got_entry (data, pltgot, ent, data_end); + printf ("\n"); + if (ent == (bfd_vma) -1) + goto sgot_print_fail; + + /* Check for the MSB of GOT[1] being set, identifying a + GNU object. This entry will be used by some runtime + loaders, to store the module pointer. Otherwise this + is an ordinary local entry. + PR 21344: Check for the entry being fully available + before fetching it. */ + if (data + && data + ent - pltgot + addr_size <= data_end + && (byte_get (data + ent - pltgot, addr_size) + >> (addr_size * 8 - 1)) != 0) + { + ent = print_mips_got_entry (data, pltgot, ent, data_end); + printf ("\n"); + if (ent == (bfd_vma) -1) + goto sgot_print_fail; + } + printf ("\n"); + } + + if (ent < end) + { + printf (_(" Local entries:\n")); + printf (" %*s %10s %*s\n", + addr_size * 2, _("Address"), _("Access"), + addr_size * 2, _("Value")); + while (ent < end) + { + ent = print_mips_got_entry (data, pltgot, ent, data_end); + printf ("\n"); + if (ent == (bfd_vma) -1) + goto sgot_print_fail; + } + printf ("\n"); + } + + sgot_print_fail: + if (data) + free (data); + } + return res; + } - for (entry = dynamic_section; entry->d_tag != DT_NULL; ++entry) + for (entry = dynamic_section; + /* PR 17531 file: 012-50589-0.004. */ + entry < dynamic_section + dynamic_nent && entry->d_tag != DT_NULL; + ++entry) switch (entry->d_tag) { case DT_MIPS_LIBLIST: @@ -12431,7 +15372,7 @@ process_mips_specific (FILE * file) { Elf32_Lib liblist; time_t atime; - char timebuf[20]; + char timebuf[128]; struct tm * tmp; liblist.l_name = BYTE_GET (elib[cnt].l_name); @@ -12490,20 +15431,27 @@ process_mips_specific (FILE * file) free (elib); } + else + res = FALSE; } if (options_offset != 0) { Elf_External_Options * eopt; - Elf_Internal_Shdr * sect = section_headers; Elf_Internal_Options * iopt; Elf_Internal_Options * option; size_t offset; int cnt; + sect = section_headers; /* Find the section header so that we get the size. */ - while (sect->sh_type != SHT_MIPS_OPTIONS) - ++sect; + sect = find_section_by_type (SHT_MIPS_OPTIONS); + /* PR 17533 file: 012-277276-0.004. */ + if (sect == NULL) + { + error (_("No MIPS_OPTIONS header found\n")); + return FALSE; + } eopt = (Elf_External_Options *) get_data (NULL, file, options_offset, 1, sect->sh_size, _("options")); @@ -12513,14 +15461,14 @@ process_mips_specific (FILE * file) cmalloc ((sect->sh_size / sizeof (eopt)), sizeof (* iopt)); if (iopt == NULL) { - error (_("Out of memory\n")); - return 0; + error (_("Out of memory allocating space for MIPS options\n")); + return FALSE; } offset = cnt = 0; option = iopt; - while (offset < sect->sh_size) + while (offset <= sect->sh_size - sizeof (* eopt)) { Elf_External_Options * eoption; @@ -12531,6 +15479,13 @@ process_mips_specific (FILE * file) option->section = BYTE_GET (eoption->section); option->info = BYTE_GET (eoption->info); + /* PR 17531: file: ffa0fa3b. */ + if (option->size < sizeof (* eopt) + || offset + option->size > sect->sh_size) + { + error (_("Invalid size (%u) for MIPS option\n"), option->size); + return FALSE; + } offset += option->size; ++option; @@ -12538,9 +15493,10 @@ process_mips_specific (FILE * file) } printf (_("\nSection '%s' contains %d entries:\n"), - SECTION_NAME (sect), cnt); + printable_section_name (sect), cnt); option = iopt; + offset = 0; while (cnt-- > 0) { @@ -12677,18 +15633,25 @@ process_mips_specific (FILE * file) len = sizeof (* eopt); while (len < option->size) - if (((char *) option)[len] >= ' ' - && ((char *) option)[len] < 0x7f) - printf ("%c", ((char *) option)[len++]); - else - printf ("\\%03o", ((char *) option)[len++]); + { + unsigned char datum = * ((unsigned char *) eopt + offset + len); + if (ISPRINT (datum)) + printf ("%c", datum); + else + printf ("\\%03o", datum); + len ++; + } fputs ("\n", stdout); + + offset += option->size; ++option; } free (eopt); } + else + res = FALSE; } if (conflicts_offset != 0 && conflictsno != 0) @@ -12699,14 +15662,23 @@ process_mips_specific (FILE * file) if (dynamic_symbols == NULL) { error (_("conflict list found without a dynamic symbol table\n")); - return 0; + return FALSE; + } + + /* PR 21345 - print a slightly more helpful error message + if we are sure that the cmalloc will fail. */ + if (conflictsno * sizeof (* iconf) > current_file_size) + { + error (_("Overlarge number of conflicts detected: %lx\n"), + (long) conflictsno); + return FALSE; } iconf = (Elf32_Conflict *) cmalloc (conflictsno, sizeof (* iconf)); if (iconf == NULL) { - error (_("Out of memory\n")); - return 0; + error (_("Out of memory allocating space for dynamic conflicts\n")); + return FALSE; } if (is_32bit_elf) @@ -12717,7 +15689,7 @@ process_mips_specific (FILE * file) get_data (NULL, file, conflicts_offset, conflictsno, sizeof (* econf32), _("conflict")); if (!econf32) - return 0; + return FALSE; for (cnt = 0; cnt < conflictsno; ++cnt) iconf[cnt] = BYTE_GET (econf32[cnt]); @@ -12732,7 +15704,7 @@ process_mips_specific (FILE * file) get_data (NULL, file, conflicts_offset, conflictsno, sizeof (* econf64), _("conflict")); if (!econf64) - return 0; + return FALSE; for (cnt = 0; cnt < conflictsno; ++cnt) iconf[cnt] = BYTE_GET (econf64[cnt]); @@ -12746,15 +15718,22 @@ process_mips_specific (FILE * file) for (cnt = 0; cnt < conflictsno; ++cnt) { - Elf_Internal_Sym * psym = & dynamic_symbols[iconf[cnt]]; - printf ("%5lu: %8lu ", (unsigned long) cnt, iconf[cnt]); - print_vma (psym->st_value, FULL_HEX); - putchar (' '); - if (VALID_DYNAMIC_NAME (psym->st_name)) - print_symbol (25, GET_DYNAMIC_NAME (psym->st_name)); + + if (iconf[cnt] >= num_dynamic_syms) + printf (_("")); else - printf (_(""), psym->st_name); + { + Elf_Internal_Sym * psym; + + psym = & dynamic_symbols[iconf[cnt]]; + print_vma (psym->st_value, FULL_HEX); + putchar (' '); + if (VALID_DYNAMIC_NAME (psym->st_name)) + print_symbol (25, GET_DYNAMIC_NAME (psym->st_name)); + else + printf (_(""), psym->st_name); + } putchar ('\n'); } @@ -12766,19 +15745,35 @@ process_mips_specific (FILE * file) bfd_vma ent, local_end, global_end; size_t i, offset; unsigned char * data; + unsigned char * data_end; int addr_size; ent = pltgot; addr_size = (is_32bit_elf ? 4 : 8); local_end = pltgot + local_gotno * addr_size; + + /* PR binutils/17533 file: 012-111227-0.004 */ + if (symtabno < gotsym) + { + error (_("The GOT symbol offset (%lu) is greater than the symbol table size (%lu)\n"), + (unsigned long) gotsym, (unsigned long) symtabno); + return FALSE; + } + global_end = local_end + (symtabno - gotsym) * addr_size; + /* PR 17531: file: 54c91a34. */ + if (global_end < local_end) + { + error (_("Too many GOT symbols: %lu\n"), (unsigned long) symtabno); + return FALSE; + } offset = offset_from_vma (file, pltgot, global_end - pltgot); data = (unsigned char *) get_data (NULL, file, offset, global_end - pltgot, 1, _("Global Offset Table data")); - if (data == NULL) - return 0; + /* PR 12855: Null data is handled gracefully throughout. */ + data_end = data + (global_end - pltgot); printf (_("\nPrimary GOT:\n")); printf (_(" Canonical gp value: ")); @@ -12789,14 +15784,25 @@ process_mips_specific (FILE * file) printf (_(" %*s %10s %*s Purpose\n"), addr_size * 2, _("Address"), _("Access"), addr_size * 2, _("Initial")); - ent = print_mips_got_entry (data, pltgot, ent); + ent = print_mips_got_entry (data, pltgot, ent, data_end); printf (_(" Lazy resolver\n")); + if (ent == (bfd_vma) -1) + goto got_print_fail; + + /* Check for the MSB of GOT[1] being set, denoting a GNU object. + This entry will be used by some runtime loaders, to store the + module pointer. Otherwise this is an ordinary local entry. + PR 21344: Check for the entry being fully available before + fetching it. */ if (data + && data + ent - pltgot + addr_size <= data_end && (byte_get (data + ent - pltgot, addr_size) >> (addr_size * 8 - 1)) != 0) { - ent = print_mips_got_entry (data, pltgot, ent); + ent = print_mips_got_entry (data, pltgot, ent, data_end); printf (_(" Module pointer (GNU extension)\n")); + if (ent == (bfd_vma) -1) + goto got_print_fail; } printf ("\n"); @@ -12808,8 +15814,10 @@ process_mips_specific (FILE * file) addr_size * 2, _("Initial")); while (ent < local_end) { - ent = print_mips_got_entry (data, pltgot, ent); + ent = print_mips_got_entry (data, pltgot, ent, data_end); printf ("\n"); + if (ent == (bfd_vma) -1) + goto got_print_fail; } printf ("\n"); } @@ -12827,28 +15835,42 @@ process_mips_specific (FILE * file) _("Type"), /* Note for translators: "Ndx" = abbreviated form of "Index". */ _("Ndx"), _("Name")); - + sym_width = (is_32bit_elf ? 80 : 160) - 28 - addr_size * 6 - 1; + for (i = gotsym; i < symtabno; i++) { - Elf_Internal_Sym * psym; - - psym = dynamic_symbols + i; - ent = print_mips_got_entry (data, pltgot, ent); + ent = print_mips_got_entry (data, pltgot, ent, data_end); printf (" "); - print_vma (psym->st_value, LONG_HEX); - printf (" %-7s %3s ", - get_symbol_type (ELF_ST_TYPE (psym->st_info)), - get_symbol_index_type (psym->st_shndx)); - if (VALID_DYNAMIC_NAME (psym->st_name)) - print_symbol (sym_width, GET_DYNAMIC_NAME (psym->st_name)); + + if (dynamic_symbols == NULL) + printf (_("")); + else if (i < num_dynamic_syms) + { + Elf_Internal_Sym * psym = dynamic_symbols + i; + + print_vma (psym->st_value, LONG_HEX); + printf (" %-7s %3s ", + get_symbol_type (ELF_ST_TYPE (psym->st_info)), + get_symbol_index_type (psym->st_shndx)); + + if (VALID_DYNAMIC_NAME (psym->st_name)) + print_symbol (sym_width, GET_DYNAMIC_NAME (psym->st_name)); + else + printf (_(""), psym->st_name); + } else - printf (_(""), psym->st_name); + printf (_(""), + (unsigned long) i); + printf ("\n"); + if (ent == (bfd_vma) -1) + break; } printf ("\n"); } + got_print_fail: if (data) free (data); } @@ -12866,12 +15888,12 @@ process_mips_specific (FILE * file) if (pltrel == DT_RELA) { if (!slurp_rela_relocs (file, rel_offset, pltrelsz, &rels, &count)) - return 0; + return FALSE; } else { if (!slurp_rel_relocs (file, rel_offset, pltrelsz, &rels, &count)) - return 0; + return FALSE; } ent = mips_pltgot; @@ -12882,7 +15904,7 @@ process_mips_specific (FILE * file) data = (unsigned char *) get_data (NULL, file, offset, end - mips_pltgot, 1, _("Procedure Linkage Table data")); if (data == NULL) - return 0; + return FALSE; printf ("\nPLT GOT:\n\n"); printf (_(" Reserved entries:\n")); @@ -12902,32 +15924,76 @@ process_mips_specific (FILE * file) sym_width = (is_32bit_elf ? 80 : 160) - 17 - addr_size * 6 - 1; for (i = 0; i < count; i++) { - Elf_Internal_Sym * psym; + unsigned long idx = get_reloc_symindex (rels[i].r_info); - psym = dynamic_symbols + get_reloc_symindex (rels[i].r_info); ent = print_mips_pltgot_entry (data, mips_pltgot, ent); printf (" "); - print_vma (psym->st_value, LONG_HEX); - printf (" %-7s %3s ", - get_symbol_type (ELF_ST_TYPE (psym->st_info)), - get_symbol_index_type (psym->st_shndx)); - if (VALID_DYNAMIC_NAME (psym->st_name)) - print_symbol (sym_width, GET_DYNAMIC_NAME (psym->st_name)); + + if (idx >= num_dynamic_syms) + printf (_(""), idx); else - printf (_(""), psym->st_name); - printf ("\n"); - } - printf ("\n"); + { + Elf_Internal_Sym * psym = dynamic_symbols + idx; - if (data) - free (data); - free (rels); + print_vma (psym->st_value, LONG_HEX); + printf (" %-7s %3s ", + get_symbol_type (ELF_ST_TYPE (psym->st_info)), + get_symbol_index_type (psym->st_shndx)); + if (VALID_DYNAMIC_NAME (psym->st_name)) + print_symbol (sym_width, GET_DYNAMIC_NAME (psym->st_name)); + else + printf (_(""), psym->st_name); + } + printf ("\n"); + } + printf ("\n"); + + if (data) + free (data); + free (rels); } - return 1; + return res; } -static int +static bfd_boolean +process_nds32_specific (FILE * file) +{ + Elf_Internal_Shdr *sect = NULL; + + sect = find_section (".nds32_e_flags"); + if (sect != NULL) + { + unsigned int *flag; + + printf ("\nNDS32 elf flags section:\n"); + flag = get_data (NULL, file, sect->sh_offset, 1, + sect->sh_size, _("NDS32 elf flags section")); + + if (! flag) + return FALSE; + + switch ((*flag) & 0x3) + { + case 0: + printf ("(VEC_SIZE):\tNo entry.\n"); + break; + case 1: + printf ("(VEC_SIZE):\t4 bytes\n"); + break; + case 2: + printf ("(VEC_SIZE):\t16 bytes\n"); + break; + case 3: + printf ("(VEC_SIZE):\treserved\n"); + break; + } + } + + return TRUE; +} + +static bfd_boolean process_gnu_liblist (FILE * file) { Elf_Internal_Shdr * section; @@ -12937,9 +16003,10 @@ process_gnu_liblist (FILE * file) size_t strtab_size; size_t cnt; unsigned i; + bfd_boolean res = TRUE; if (! do_arch) - return 0; + return TRUE; for (i = 0, section = section_headers; i < elf_header.e_shnum; @@ -12956,9 +16023,12 @@ process_gnu_liblist (FILE * file) _("liblist section data")); if (elib == NULL) - break; - string_sec = section_headers + section->sh_link; + { + res = FALSE; + break; + } + string_sec = section_headers + section->sh_link; strtab = (char *) get_data (NULL, file, string_sec->sh_offset, 1, string_sec->sh_size, _("liblist string table")); @@ -12967,12 +16037,13 @@ process_gnu_liblist (FILE * file) { free (elib); free (strtab); + res = FALSE; break; } strtab_size = string_sec->sh_size; printf (_("\nLibrary list section '%s' contains %lu entries:\n"), - SECTION_NAME (section), + printable_section_name (section), (unsigned long) (section->sh_size / sizeof (Elf32_External_Lib))); puts (_(" Library Time Stamp Checksum Version Flags")); @@ -12982,7 +16053,7 @@ process_gnu_liblist (FILE * file) { Elf32_Lib liblist; time_t atime; - char timebuf[20]; + char timebuf[128]; struct tm * tmp; liblist.l_name = BYTE_GET (elib[cnt].l_name); @@ -13013,7 +16084,7 @@ process_gnu_liblist (FILE * file) } } - return 1; + return res; } static const char * @@ -13064,6 +16135,10 @@ get_note_type (unsigned e_type) return _("NT_S390_SYSTEM_CALL (s390 system call restart data)"); case NT_S390_TDB: return _("NT_S390_TDB (s390 transaction diagnostic block)"); + case NT_S390_VXRS_LOW: + return _("NT_S390_VXRS_LOW (s390 vector registers 0-15 upper half)"); + case NT_S390_VXRS_HIGH: + return _("NT_S390_VXRS_HIGH (s390 vector registers 16-31)"); case NT_ARM_VFP: return _("NT_ARM_VFP (arm VFP registers)"); case NT_ARM_TLS: @@ -13098,6 +16173,10 @@ get_note_type (unsigned e_type) return _("NT_VERSION (version)"); case NT_ARCH: return _("NT_ARCH (architecture)"); + case NT_GNU_BUILD_ATTRIBUTE_OPEN: + return _("NT_GNU_BUILD_ATTRIBUTE_OPEN"); + case NT_GNU_BUILD_ATTRIBUTE_FUNC: + return _("NT_GNU_BUILD_ATTRIBUTE_FUNC"); default: break; } @@ -13106,7 +16185,7 @@ get_note_type (unsigned e_type) return buff; } -static int +static bfd_boolean print_core_note (Elf_Internal_Note *pnote) { unsigned int addr_size = is_32bit_elf ? 4 : 8; @@ -13114,21 +16193,21 @@ print_core_note (Elf_Internal_Note *pnote) unsigned char *descdata, *filenames, *descend; if (pnote->type != NT_FILE) - return 1; + return TRUE; #ifndef BFD64 if (!is_32bit_elf) { printf (_(" Cannot decode 64-bit note in 32-bit build\n")); /* Still "successful". */ - return 1; + return TRUE; } #endif if (pnote->descsz < 2 * addr_size) { - printf (_(" Malformed note - too short for header\n")); - return 0; + error (_(" Malformed note - too short for header\n")); + return FALSE; } descdata = (unsigned char *) pnote->descdata; @@ -13136,8 +16215,8 @@ print_core_note (Elf_Internal_Note *pnote) if (descdata[pnote->descsz - 1] != '\0') { - printf (_(" Malformed note - does not end with \\0\n")); - return 0; + error (_(" Malformed note - does not end with \\0\n")); + return FALSE; } count = byte_get (descdata, addr_size); @@ -13148,8 +16227,8 @@ print_core_note (Elf_Internal_Note *pnote) if (pnote->descsz < 2 * addr_size + count * 3 * addr_size) { - printf (_(" Malformed note - too short for supplied file count\n")); - return 0; + error (_(" Malformed note - too short for supplied file count\n")); + return FALSE; } printf (_(" Page size: ")); @@ -13161,14 +16240,14 @@ print_core_note (Elf_Internal_Note *pnote) (int) (4 + 2 * addr_size), _("End"), (int) (4 + 2 * addr_size), _("Page Offset")); filenames = descdata + count * 3 * addr_size; - while (--count > 0) + while (count-- > 0) { bfd_vma start, end, file_ofs; if (filenames == descend) { - printf (_(" Malformed note - filenames end too early\n")); - return 0; + error (_(" Malformed note - filenames end too early\n")); + return FALSE; } start = byte_get (descdata, addr_size); @@ -13189,14 +16268,13 @@ print_core_note (Elf_Internal_Note *pnote) filenames += 1 + strlen ((char *) filenames); } - return 1; + return TRUE; } static const char * get_gnu_elf_note_type (unsigned e_type) { - static char buff[64]; - + /* NB/ Keep this switch statement in sync with print_gnu_note (). */ switch (e_type) { case NT_GNU_ABI_TAG: @@ -13207,17 +16285,175 @@ get_gnu_elf_note_type (unsigned e_type) return _("NT_GNU_BUILD_ID (unique build ID bitstring)"); case NT_GNU_GOLD_VERSION: return _("NT_GNU_GOLD_VERSION (gold version)"); + case NT_GNU_PROPERTY_TYPE_0: + return _("NT_GNU_PROPERTY_TYPE_0"); + case NT_GNU_BUILD_ATTRIBUTE_OPEN: + return _("NT_GNU_BUILD_ATTRIBUTE_OPEN"); + case NT_GNU_BUILD_ATTRIBUTE_FUNC: + return _("NT_GNU_BUILD_ATTRIBUTE_FUNC"); default: - break; + { + static char buff[64]; + + snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), e_type); + return buff; + } } +} - snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), e_type); - return buff; +static void +decode_x86_isa (unsigned int bitmask) +{ + while (bitmask) + { + unsigned int bit = bitmask & (- bitmask); + + bitmask &= ~ bit; + switch (bit) + { + case GNU_PROPERTY_X86_ISA_1_486: printf ("i486"); break; + case GNU_PROPERTY_X86_ISA_1_586: printf ("586"); break; + case GNU_PROPERTY_X86_ISA_1_686: printf ("686"); break; + case GNU_PROPERTY_X86_ISA_1_SSE: printf ("SSE"); break; + case GNU_PROPERTY_X86_ISA_1_SSE2: printf ("SSE2"); break; + case GNU_PROPERTY_X86_ISA_1_SSE3: printf ("SSE3"); break; + case GNU_PROPERTY_X86_ISA_1_SSSE3: printf ("SSSE3"); break; + case GNU_PROPERTY_X86_ISA_1_SSE4_1: printf ("SSE4_1"); break; + case GNU_PROPERTY_X86_ISA_1_SSE4_2: printf ("SSE4_2"); break; + case GNU_PROPERTY_X86_ISA_1_AVX: printf ("AVX"); break; + case GNU_PROPERTY_X86_ISA_1_AVX2: printf ("AVX2"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512F: printf ("AVX512F"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512CD: printf ("AVX512CD"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512ER: printf ("AVX512ER"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512PF: printf ("AVX512PF"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512VL: printf ("AVX512VL"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512DQ: printf ("AVX512DQ"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512BW: printf ("AVX512BW"); break; + default: printf (_(""), bit); break; + } + if (bitmask) + printf (", "); + } } -static int +static void +print_gnu_property_note (Elf_Internal_Note * pnote) +{ + unsigned char * ptr = (unsigned char *) pnote->descdata; + unsigned char * ptr_end = ptr + pnote->descsz; + unsigned int size = is_32bit_elf ? 4 : 8; + + printf (_(" Properties: ")); + + if (pnote->descsz < 8 || (pnote->descsz % size) != 0) + { + printf (_("\n"), pnote->descsz); + return; + } + + while (1) + { + unsigned int j; + unsigned int type = byte_get (ptr, 4); + unsigned int datasz = byte_get (ptr + 4, 4); + + ptr += 8; + + if ((ptr + datasz) > ptr_end) + { + printf (_("\n"), + type, datasz); + break; + } + + if (type >= GNU_PROPERTY_LOPROC && type <= GNU_PROPERTY_HIPROC) + { + if (elf_header.e_machine == EM_X86_64 + || elf_header.e_machine == EM_IAMCU + || elf_header.e_machine == EM_386) + { + switch (type) + { + case GNU_PROPERTY_X86_ISA_1_USED: + printf ("x86 ISA used: "); + if (datasz != 4) + printf (_(" "), datasz); + else + decode_x86_isa (byte_get (ptr, 4)); + goto next; + + case GNU_PROPERTY_X86_ISA_1_NEEDED: + printf ("x86 ISA needed: "); + if (datasz != 4) + printf (_(" "), datasz); + else + decode_x86_isa (byte_get (ptr, 4)); + goto next; + + default: + break; + } + } + } + else + { + switch (type) + { + case GNU_PROPERTY_STACK_SIZE: + printf (_("stack size: ")); + if (datasz != size) + printf (_(" "), datasz); + else + printf ("%#lx", (unsigned long) byte_get (ptr, size)); + goto next; + + case GNU_PROPERTY_NO_COPY_ON_PROTECTED: + printf ("no copy on protected "); + if (datasz) + printf (_(" "), datasz); + goto next; + + default: + break; + } + } + + if (type < GNU_PROPERTY_LOPROC) + printf (_(""); + +next: + ptr += ((datasz + (size - 1)) & ~ (size - 1)); + if (ptr == ptr_end) + break; + else + { + if (do_wide) + printf (", "); + else + printf ("\n\t"); + } + + if (ptr > (ptr_end - 8)) + { + printf (_("\n"), pnote->descsz); + break; + } + } + + printf ("\n"); +} + +static bfd_boolean print_gnu_note (Elf_Internal_Note *pnote) { + /* NB/ Keep this switch statement in sync with get_gnu_elf_note_type (). */ switch (pnote->type) { case NT_GNU_BUILD_ID: @@ -13236,6 +16472,13 @@ print_gnu_note (Elf_Internal_Note *pnote) unsigned long os, major, minor, subminor; const char *osname; + /* PR 17531: file: 030-599401-0.004. */ + if (pnote->descsz < 16) + { + printf (_(" \n")); + break; + } + os = byte_get ((unsigned char *) pnote->descdata, 4); major = byte_get ((unsigned char *) pnote->descdata + 4, 4); minor = byte_get ((unsigned char *) pnote->descdata + 8, 4); @@ -13258,6 +16501,12 @@ print_gnu_note (Elf_Internal_Note *pnote) case GNU_ABI_TAG_NETBSD: osname = "NetBSD"; break; + case GNU_ABI_TAG_SYLLABLE: + osname = "Syllable"; + break; + case GNU_ABI_TAG_NACL: + osname = "NaCl"; + break; default: osname = "Unknown"; break; @@ -13267,9 +16516,201 @@ print_gnu_note (Elf_Internal_Note *pnote) major, minor, subminor); } break; + + case NT_GNU_GOLD_VERSION: + { + unsigned long i; + + printf (_(" Version: ")); + for (i = 0; i < pnote->descsz && pnote->descdata[i] != '\0'; ++i) + printf ("%c", pnote->descdata[i]); + printf ("\n"); + } + break; + + case NT_GNU_HWCAP: + { + unsigned long num_entries, mask; + + /* Hardware capabilities information. Word 0 is the number of entries. + Word 1 is a bitmask of enabled entries. The rest of the descriptor + is a series of entries, where each entry is a single byte followed + by a nul terminated string. The byte gives the bit number to test + if enabled in the bitmask. */ + printf (_(" Hardware Capabilities: ")); + if (pnote->descsz < 8) + { + error (_("\n")); + return FALSE; + } + num_entries = byte_get ((unsigned char *) pnote->descdata, 4); + mask = byte_get ((unsigned char *) pnote->descdata + 4, 4); + printf (_("num entries: %ld, enabled mask: %lx\n"), num_entries, mask); + /* FIXME: Add code to display the entries... */ + } + break; + + case NT_GNU_PROPERTY_TYPE_0: + print_gnu_property_note (pnote); + break; + + default: + /* Handle unrecognised types. An error message should have already been + created by get_gnu_elf_note_type(), so all that we need to do is to + display the data. */ + { + unsigned long i; + + printf (_(" Description data: ")); + for (i = 0; i < pnote->descsz; ++i) + printf ("%02x ", pnote->descdata[i] & 0xff); + printf ("\n"); + } + break; + } + + return TRUE; +} + +static const char * +get_v850_elf_note_type (enum v850_notes n_type) +{ + static char buff[64]; + + switch (n_type) + { + case V850_NOTE_ALIGNMENT: return _("Alignment of 8-byte objects"); + case V850_NOTE_DATA_SIZE: return _("Sizeof double and long double"); + case V850_NOTE_FPU_INFO: return _("Type of FPU support needed"); + case V850_NOTE_SIMD_INFO: return _("Use of SIMD instructions"); + case V850_NOTE_CACHE_INFO: return _("Use of cache"); + case V850_NOTE_MMU_INFO: return _("Use of MMU"); + default: + snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), n_type); + return buff; + } +} + +static bfd_boolean +print_v850_note (Elf_Internal_Note * pnote) +{ + unsigned int val; + + if (pnote->descsz != 4) + return FALSE; + + val = byte_get ((unsigned char *) pnote->descdata, pnote->descsz); + + if (val == 0) + { + printf (_("not set\n")); + return TRUE; + } + + switch (pnote->type) + { + case V850_NOTE_ALIGNMENT: + switch (val) + { + case EF_RH850_DATA_ALIGN4: printf (_("4-byte\n")); return TRUE; + case EF_RH850_DATA_ALIGN8: printf (_("8-byte\n")); return TRUE; + } + break; + + case V850_NOTE_DATA_SIZE: + switch (val) + { + case EF_RH850_DOUBLE32: printf (_("4-bytes\n")); return TRUE; + case EF_RH850_DOUBLE64: printf (_("8-bytes\n")); return TRUE; + } + break; + + case V850_NOTE_FPU_INFO: + switch (val) + { + case EF_RH850_FPU20: printf (_("FPU-2.0\n")); return TRUE; + case EF_RH850_FPU30: printf (_("FPU-3.0\n")); return TRUE; + } + break; + + case V850_NOTE_MMU_INFO: + case V850_NOTE_CACHE_INFO: + case V850_NOTE_SIMD_INFO: + if (val == EF_RH850_SIMD) + { + printf (_("yes\n")); + return TRUE; + } + break; + + default: + /* An 'unknown note type' message will already have been displayed. */ + break; } - return 1; + printf (_("unknown value: %x\n"), val); + return FALSE; +} + +static bfd_boolean +process_netbsd_elf_note (Elf_Internal_Note * pnote) +{ + unsigned int version; + + switch (pnote->type) + { + case NT_NETBSD_IDENT: + version = byte_get ((unsigned char *) pnote->descdata, sizeof (version)); + if ((version / 10000) % 100) + printf (" NetBSD\t\t0x%08lx\tIDENT %u (%u.%u%s%c)\n", pnote->descsz, + version, version / 100000000, (version / 1000000) % 100, + (version / 10000) % 100 > 26 ? "Z" : "", + 'A' + (version / 10000) % 26); + else + printf (" NetBSD\t\t0x%08lx\tIDENT %u (%u.%u.%u)\n", pnote->descsz, + version, version / 100000000, (version / 1000000) % 100, + (version / 100) % 100); + return TRUE; + + case NT_NETBSD_MARCH: + printf (" NetBSD\t0x%08lx\tMARCH <%s>\n", pnote->descsz, + pnote->descdata); + return TRUE; + + default: + printf (" NetBSD\t0x%08lx\tUnknown note type: (0x%08lx)\n", pnote->descsz, + pnote->type); + return FALSE; + } +} + +static const char * +get_freebsd_elfcore_note_type (unsigned e_type) +{ + switch (e_type) + { + case NT_FREEBSD_THRMISC: + return _("NT_THRMISC (thrmisc structure)"); + case NT_FREEBSD_PROCSTAT_PROC: + return _("NT_PROCSTAT_PROC (proc data)"); + case NT_FREEBSD_PROCSTAT_FILES: + return _("NT_PROCSTAT_FILES (files data)"); + case NT_FREEBSD_PROCSTAT_VMMAP: + return _("NT_PROCSTAT_VMMAP (vmmap data)"); + case NT_FREEBSD_PROCSTAT_GROUPS: + return _("NT_PROCSTAT_GROUPS (groups data)"); + case NT_FREEBSD_PROCSTAT_UMASK: + return _("NT_PROCSTAT_UMASK (umask data)"); + case NT_FREEBSD_PROCSTAT_RLIMIT: + return _("NT_PROCSTAT_RLIMIT (rlimit data)"); + case NT_FREEBSD_PROCSTAT_OSREL: + return _("NT_PROCSTAT_OSREL (osreldate data)"); + case NT_FREEBSD_PROCSTAT_PSSTRINGS: + return _("NT_PROCSTAT_PSSTRINGS (ps_strings data)"); + case NT_FREEBSD_PROCSTAT_AUXV: + return _("NT_PROCSTAT_AUXV (auxv data)"); + } + return get_note_type (e_type); } static const char * @@ -13352,7 +16793,7 @@ get_stapsdt_note_type (unsigned e_type) return buff; } -static int +static bfd_boolean print_stapsdt_note (Elf_Internal_Note *pnote) { int addr_size = is_32bit_elf ? 4 : 8; @@ -13430,7 +16871,7 @@ get_ia64_vms_note_type (unsigned e_type) } } -static int +static bfd_boolean print_ia64_vms_note (Elf_Internal_Note * pnote) { switch (pnote->type) @@ -13450,55 +16891,442 @@ print_ia64_vms_note (Elf_Internal_Note * pnote) case NT_VMS_LNM: printf (_(" Language: %s\n"), pnote->descdata); break; -#ifdef BFD64 - case NT_VMS_FPMODE: - printf (_(" Floating Point mode: ")); - printf ("0x%016" BFD_VMA_FMT "x\n", - (bfd_vma)byte_get ((unsigned char *)pnote->descdata, 8)); +#ifdef BFD64 + case NT_VMS_FPMODE: + printf (_(" Floating Point mode: ")); + printf ("0x%016" BFD_VMA_FMT "x\n", + (bfd_vma) byte_get ((unsigned char *)pnote->descdata, 8)); + break; + case NT_VMS_LINKTIME: + printf (_(" Link time: ")); + print_vms_time + ((bfd_int64_t) byte_get ((unsigned char *)pnote->descdata, 8)); + printf ("\n"); + break; + case NT_VMS_PATCHTIME: + printf (_(" Patch time: ")); + print_vms_time + ((bfd_int64_t) byte_get ((unsigned char *)pnote->descdata, 8)); + printf ("\n"); + break; + case NT_VMS_ORIG_DYN: + printf (_(" Major id: %u, minor id: %u\n"), + (unsigned) byte_get ((unsigned char *)pnote->descdata, 4), + (unsigned) byte_get ((unsigned char *)pnote->descdata + 4, 4)); + printf (_(" Last modified : ")); + print_vms_time + ((bfd_int64_t) byte_get ((unsigned char *)pnote->descdata + 8, 8)); + printf (_("\n Link flags : ")); + printf ("0x%016" BFD_VMA_FMT "x\n", + (bfd_vma) byte_get ((unsigned char *)pnote->descdata + 16, 8)); + printf (_(" Header flags: 0x%08x\n"), + (unsigned) byte_get ((unsigned char *)pnote->descdata + 24, 4)); + printf (_(" Image id : %s\n"), pnote->descdata + 32); + break; +#endif + case NT_VMS_IMGNAM: + printf (_(" Image name: %s\n"), pnote->descdata); + break; + case NT_VMS_GSTNAM: + printf (_(" Global symbol table name: %s\n"), pnote->descdata); + break; + case NT_VMS_IMGID: + printf (_(" Image id: %s\n"), pnote->descdata); + break; + case NT_VMS_LINKID: + printf (_(" Linker id: %s\n"), pnote->descdata); + break; + default: + return FALSE; + } + return TRUE; +} + +/* Print the name of the symbol associated with a build attribute + that is attached to address OFFSET. */ + +static bfd_boolean +print_symbol_for_build_attribute (FILE * file, + unsigned long offset, + bfd_boolean is_open_attr) +{ + static FILE * saved_file = NULL; + static char * strtab; + static unsigned long strtablen; + static Elf_Internal_Sym * symtab; + static unsigned long nsyms; + Elf_Internal_Sym * saved_sym = NULL; + Elf_Internal_Sym * sym; + + if (section_headers != NULL + && (saved_file == NULL || file != saved_file)) + { + Elf_Internal_Shdr * symsec; + + /* Load the symbol and string sections. */ + for (symsec = section_headers; + symsec < section_headers + elf_header.e_shnum; + symsec ++) + { + if (symsec->sh_type == SHT_SYMTAB) + { + symtab = GET_ELF_SYMBOLS (file, symsec, & nsyms); + + if (symsec->sh_link < elf_header.e_shnum) + { + Elf_Internal_Shdr * strtab_sec = section_headers + symsec->sh_link; + + strtab = (char *) get_data (NULL, file, strtab_sec->sh_offset, + 1, strtab_sec->sh_size, + _("string table")); + strtablen = strtab != NULL ? strtab_sec->sh_size : 0; + } + } + } + saved_file = file; + } + + if (symtab == NULL || strtab == NULL) + { + printf ("\n"); + return FALSE; + } + + /* Find a symbol whose value matches offset. */ + for (sym = symtab; sym < symtab + nsyms; sym ++) + if (sym->st_value == offset) + { + if (sym->st_name >= strtablen) + /* Huh ? This should not happen. */ + continue; + + if (strtab[sym->st_name] == 0) + continue; + + if (is_open_attr) + { + /* For OPEN attributes we prefer GLOBAL over LOCAL symbols + and FILE or OBJECT symbols over NOTYPE symbols. We skip + FUNC symbols entirely. */ + switch (ELF_ST_TYPE (sym->st_info)) + { + case STT_FILE: + saved_sym = sym; + /* We can stop searching now. */ + sym = symtab + nsyms; + continue; + + case STT_OBJECT: + saved_sym = sym; + continue; + + case STT_FUNC: + /* Ignore function symbols. */ + continue; + + default: + break; + } + + switch (ELF_ST_BIND (sym->st_info)) + { + case STB_GLOBAL: + if (saved_sym == NULL + || ELF_ST_TYPE (saved_sym->st_info) != STT_OBJECT) + saved_sym = sym; + break; + + case STB_LOCAL: + if (saved_sym == NULL) + saved_sym = sym; + break; + + default: + break; + } + } + else + { + if (ELF_ST_TYPE (sym->st_info) != STT_FUNC) + continue; + + saved_sym = sym; + break; + } + } + + printf (" (%s: %s)\n", + is_open_attr ? _("file") : _("func"), + saved_sym ? strtab + saved_sym->st_name : _(")")); + return TRUE; +} + +static bfd_boolean +print_gnu_build_attribute_description (Elf_Internal_Note * pnote, + FILE * file) +{ + static unsigned long global_offset = 0; + unsigned long offset; + unsigned int desc_size = is_32bit_elf ? 4 : 8; + bfd_boolean is_open_attr = pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN; + + if (pnote->descsz == 0) + { + if (is_open_attr) + { + printf (_(" Applies from offset %#lx\n"), global_offset); + return TRUE; + } + else + { + printf (_(" Applies to func at %#lx"), global_offset); + return print_symbol_for_build_attribute (file, global_offset, is_open_attr); + } + } + + if (pnote->descsz != desc_size) + { + error (_(" \n"), pnote->descsz); + printf (_(" ")); + return FALSE; + } + + offset = byte_get ((unsigned char *) pnote->descdata, desc_size); + + if (is_open_attr) + { + printf (_(" Applies from offset %#lx"), offset); + global_offset = offset; + } + else + { + printf (_(" Applies to func at %#lx"), offset); + } + + return print_symbol_for_build_attribute (file, offset, is_open_attr); +} + +static bfd_boolean +print_gnu_build_attribute_name (Elf_Internal_Note * pnote) +{ + static const char string_expected [2] = { GNU_BUILD_ATTRIBUTE_TYPE_STRING, 0 }; + static const char number_expected [2] = { GNU_BUILD_ATTRIBUTE_TYPE_NUMERIC, 0 }; + static const char bool_expected [3] = { GNU_BUILD_ATTRIBUTE_TYPE_BOOL_TRUE, GNU_BUILD_ATTRIBUTE_TYPE_BOOL_FALSE, 0 }; + char name_type; + char name_attribute; + const char * expected_types; + const char * name = pnote->namedata; + const char * text; + int left; + + if (name == NULL || pnote->namesz < 2) + { + error (_("corrupt name field in GNU build attribute note: size = %ld\n"), pnote->namesz); + print_symbol (-20, _(" ")); + return FALSE; + } + + switch ((name_type = * name)) + { + case GNU_BUILD_ATTRIBUTE_TYPE_NUMERIC: + case GNU_BUILD_ATTRIBUTE_TYPE_STRING: + case GNU_BUILD_ATTRIBUTE_TYPE_BOOL_TRUE: + case GNU_BUILD_ATTRIBUTE_TYPE_BOOL_FALSE: + printf ("%c", * name); + break; + default: + error (_("unrecognised attribute type in name field: %d\n"), name_type); + print_symbol (-20, _("")); + return FALSE; + } + + left = 19; + ++ name; + text = NULL; + + switch ((name_attribute = * name)) + { + case GNU_BUILD_ATTRIBUTE_VERSION: + text = _(""); + expected_types = string_expected; + ++ name; break; - case NT_VMS_LINKTIME: - printf (_(" Link time: ")); - print_vms_time - ((bfd_int64_t) byte_get ((unsigned char *)pnote->descdata, 8)); - printf ("\n"); + case GNU_BUILD_ATTRIBUTE_STACK_PROT: + text = _(""); + expected_types = "!+*"; + ++ name; break; - case NT_VMS_PATCHTIME: - printf (_(" Patch time: ")); - print_vms_time - ((bfd_int64_t) byte_get ((unsigned char *)pnote->descdata, 8)); - printf ("\n"); + case GNU_BUILD_ATTRIBUTE_RELRO: + text = _(""); + expected_types = bool_expected; + ++ name; break; - case NT_VMS_ORIG_DYN: - printf (_(" Major id: %u, minor id: %u\n"), - (unsigned) byte_get ((unsigned char *)pnote->descdata, 4), - (unsigned) byte_get ((unsigned char *)pnote->descdata + 4, 4)); - printf (_(" Last modified : ")); - print_vms_time - ((bfd_int64_t) byte_get ((unsigned char *)pnote->descdata + 8, 8)); - printf (_("\n Link flags : ")); - printf ("0x%016" BFD_VMA_FMT "x\n", - (bfd_vma)byte_get ((unsigned char *)pnote->descdata + 16, 8)); - printf (_(" Header flags: 0x%08x\n"), - (unsigned)byte_get ((unsigned char *)pnote->descdata + 24, 4)); - printf (_(" Image id : %s\n"), pnote->descdata + 32); + case GNU_BUILD_ATTRIBUTE_STACK_SIZE: + text = _(""); + expected_types = number_expected; + ++ name; break; -#endif - case NT_VMS_IMGNAM: - printf (_(" Image name: %s\n"), pnote->descdata); + case GNU_BUILD_ATTRIBUTE_TOOL: + text = _(""); + expected_types = string_expected; + ++ name; break; - case NT_VMS_GSTNAM: - printf (_(" Global symbol table name: %s\n"), pnote->descdata); + case GNU_BUILD_ATTRIBUTE_ABI: + text = _(""); + expected_types = "$*"; + ++ name; break; - case NT_VMS_IMGID: - printf (_(" Image id: %s\n"), pnote->descdata); + case GNU_BUILD_ATTRIBUTE_PIC: + text = _(""); + expected_types = number_expected; + ++ name; break; - case NT_VMS_LINKID: - printf (_(" Linker id: %s\n"), pnote->descdata); + case GNU_BUILD_ATTRIBUTE_SHORT_ENUM: + text = _(""); + expected_types = bool_expected; + ++ name; break; default: + if (ISPRINT (* name)) + { + int len = strnlen (name, pnote->namesz - (name - pnote->namedata)) + 1; + + if (len > left && ! do_wide) + len = left; + printf ("%.*s:", len, name); + left -= len; + name += len; + } + else + { + static char tmpbuf [128]; + error (_("unrecognised byte in name field: %d\n"), * name); + sprintf (tmpbuf, _(""), * name); + text = tmpbuf; + name ++; + } + expected_types = "*$!+"; + break; + } + + if (text) + { + printf ("%s", text); + left -= strlen (text); + } + + if (strchr (expected_types, name_type) == NULL) + warn (_("attribute does not have an expected type (%c)\n"), name_type); + + if ((unsigned long)(name - pnote->namedata) > pnote->namesz) + { + error (_("corrupt name field: namesz: %lu but parsing gets to %ld\n"), + (unsigned long) pnote->namesz, + (long) (name - pnote->namedata)); + return FALSE; + } + + if (left < 1 && ! do_wide) + return TRUE; + + switch (name_type) + { + case GNU_BUILD_ATTRIBUTE_TYPE_NUMERIC: + { + unsigned int bytes; + unsigned long long val = 0; + unsigned int shift = 0; + char * decoded = NULL; + + bytes = pnote->namesz - (name - pnote->namedata); + if (bytes > 0) + /* The -1 is because the name field is always 0 terminated, and we + want to be able to ensure that the shift in the while loop below + will not overflow. */ + -- bytes; + + if (bytes > sizeof (val)) + { + fprintf (stderr, "namesz %lx name %p namedata %p\n", + pnote->namesz, name, pnote->namedata); + error (_("corrupt numeric name field: too many bytes in the value: %x\n"), + bytes); + bytes = sizeof (val); + } + /* We do not bother to warn if bytes == 0 as this can + happen with some early versions of the gcc plugin. */ + + while (bytes --) + { + unsigned long byte = (* name ++) & 0xff; + + val |= byte << shift; + shift += 8; + } + + switch (name_attribute) + { + case GNU_BUILD_ATTRIBUTE_PIC: + switch (val) + { + case 0: decoded = "static"; break; + case 1: decoded = "pic"; break; + case 2: decoded = "PIC"; break; + case 3: decoded = "pie"; break; + case 4: decoded = "PIE"; break; + default: break; + } + break; + case GNU_BUILD_ATTRIBUTE_STACK_PROT: + switch (val) + { + /* Based upon the SPCT_FLAG_xxx enum values in gcc/cfgexpand.c. */ + case 0: decoded = "off"; break; + case 1: decoded = "on"; break; + case 2: decoded = "all"; break; + case 3: decoded = "strong"; break; + case 4: decoded = "explicit"; break; + default: break; + } + break; + default: + break; + } + + if (decoded != NULL) + { + print_symbol (-left, decoded); + left = 0; + } + else if (val == 0) + { + printf ("0x0"); + left -= 3; + } + else + { + if (do_wide) + left -= printf ("0x%llx", val); + else + left -= printf ("0x%-.*llx", left, val); + } + } + break; + case GNU_BUILD_ATTRIBUTE_TYPE_STRING: + left -= print_symbol (- left, name); + break; + case GNU_BUILD_ATTRIBUTE_TYPE_BOOL_TRUE: + left -= print_symbol (- left, "true"); + break; + case GNU_BUILD_ATTRIBUTE_TYPE_BOOL_FALSE: + left -= print_symbol (- left, "false"); break; } - return 1; + + if (do_wide && left > 0) + printf ("%-*s", left, " "); + + return TRUE; } /* Note that by the ELF standard, the name field is already null byte @@ -13506,8 +17334,10 @@ print_ia64_vms_note (Elf_Internal_Note * pnote) I.E. the value of namesz for the name "FSF" is 4. If the value of namesz is zero, there is no name present. */ -static int -process_note (Elf_Internal_Note * pnote) + +static bfd_boolean +process_note (Elf_Internal_Note * pnote, + FILE * file) { const char * name = pnote->namesz ? pnote->namedata : "(NONE)"; const char * nt; @@ -13521,10 +17351,18 @@ process_note (Elf_Internal_Note * pnote) /* GNU-specific object file notes. */ nt = get_gnu_elf_note_type (pnote->type); + else if (const_strneq (pnote->namedata, "FreeBSD")) + /* FreeBSD-specific core file notes. */ + nt = get_freebsd_elfcore_note_type (pnote->type); + else if (const_strneq (pnote->namedata, "NetBSD-CORE")) /* NetBSD-specific core file notes. */ nt = get_netbsd_elfcore_note_type (pnote->type); + else if (const_strneq (pnote->namedata, "NetBSD")) + /* NetBSD-specific core file notes. */ + return process_netbsd_elf_note (pnote); + else if (strneq (pnote->namedata, "SPU/", 4)) { /* SPU-specific core file notes. */ @@ -13544,7 +17382,18 @@ process_note (Elf_Internal_Note * pnote) note type strings. */ nt = get_note_type (pnote->type); - printf (" %-20s 0x%08lx\t%s\n", name, pnote->descsz, nt); + printf (" "); + + if (pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN + || pnote->type == NT_GNU_BUILD_ATTRIBUTE_FUNC) + print_gnu_build_attribute_name (pnote); + else + print_symbol (-20, name); + + if (do_wide) + printf (" 0x%08lx\t%s\t", pnote->descsz, nt); + else + printf (" 0x%08lx\t%s\n", pnote->descsz, nt); if (const_strneq (pnote->namedata, "IPF/VMS")) return print_ia64_vms_note (pnote); @@ -13554,39 +17403,72 @@ process_note (Elf_Internal_Note * pnote) return print_stapsdt_note (pnote); else if (const_strneq (pnote->namedata, "CORE")) return print_core_note (pnote); - else - return 1; -} + else if (pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN + || pnote->type == NT_GNU_BUILD_ATTRIBUTE_FUNC) + return print_gnu_build_attribute_description (pnote, file); + + if (pnote->descsz) + { + unsigned long i; + + printf (_(" description data: ")); + for (i = 0; i < pnote->descsz; i++) + printf ("%02x ", pnote->descdata[i]); + } + + if (do_wide) + printf ("\n"); + return TRUE; +} -static int -process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) +static bfd_boolean +process_notes_at (FILE * file, + Elf_Internal_Shdr * section, + bfd_vma offset, + bfd_vma length) { Elf_External_Note * pnotes; Elf_External_Note * external; - int res = 1; + char * end; + bfd_boolean res = TRUE; if (length <= 0) - return 0; + return FALSE; - pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length, - _("notes")); + if (section) + { + pnotes = (Elf_External_Note *) get_section_contents (section, file); + if (pnotes) + { + if (! apply_relocations (file, section, (unsigned char *) pnotes, length, NULL, NULL)) + return FALSE; + } + } + else + pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length, + _("notes")); if (pnotes == NULL) - return 0; + return FALSE; external = pnotes; - printf (_("\nDisplaying notes found at file offset 0x%08lx with length 0x%08lx:\n"), - (unsigned long) offset, (unsigned long) length); + if (section) + printf (_("\nDisplaying notes found in: %s\n"), printable_section_name (section)); + else + printf (_("\nDisplaying notes found at file offset 0x%08lx with length 0x%08lx:\n"), + (unsigned long) offset, (unsigned long) length); + printf (_(" %-20s %10s\tDescription\n"), _("Owner"), _("Data size")); - while ((char *) external < (char *) pnotes + length) + end = (char *) pnotes + length; + while ((char *) external < end) { Elf_Internal_Note inote; size_t min_notesz; char *next; char * temp = NULL; - size_t data_remaining = ((char *) pnotes + length) - (char *) external; + size_t data_remaining = end - (char *) external; if (!is_ia64_vms ()) { @@ -13604,6 +17486,15 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) inote.namedata = external->name; inote.descsz = BYTE_GET (external->descsz); inote.descdata = inote.namedata + align_power (inote.namesz, 2); + /* PR 17531: file: 3443835e. */ + if (inote.descdata < (char *) pnotes || inote.descdata > end) + { + warn (_("Corrupt note: name size is too big: (got: %lx, expected no more than: %lx)\n"), + inote.namesz, (long)(end - inote.namedata)); + inote.descdata = inote.namedata; + inote.namesz = 0; + } + inote.descpos = offset + (inote.descdata - (char *) pnotes); next = inote.descdata + align_power (inote.descsz, 2); } @@ -13633,6 +17524,9 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) if (inote.descdata < (char *) external + min_notesz || next < (char *) external + min_notesz + /* PR binutils/17531: file: id:000000,sig:11,src:006986,op:havoc,rep:4. */ + || inote.namedata + inote.namesz < inote.namedata + || inote.descdata + inote.descsz < inote.descdata || data_remaining < (size_t)(next - (char *) external)) { warn (_("note with invalid namesz and/or descsz found at offset 0x%lx\n"), @@ -13651,22 +17545,22 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) if (inote.namedata[inote.namesz - 1] != '\0') { temp = (char *) malloc (inote.namesz + 1); - if (temp == NULL) { - error (_("Out of memory\n")); - res = 0; + error (_("Out of memory allocating space for inote name\n")); + res = FALSE; break; } - strncpy (temp, inote.namedata, inote.namesz); + memcpy (temp, inote.namedata, inote.namesz); temp[inote.namesz] = 0; /* warn (_("'%s' NOTE name not properly null terminated\n"), temp); */ inote.namedata = temp; } - res &= process_note (& inote); + if (! process_note (& inote, file)) + res = FALSE; if (temp != NULL) { @@ -13680,53 +17574,158 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) return res; } -static int +static bfd_boolean process_corefile_note_segments (FILE * file) { Elf_Internal_Phdr * segment; unsigned int i; - int res = 1; + bfd_boolean res = TRUE; if (! get_program_headers (file)) - return 0; + return TRUE; for (i = 0, segment = program_headers; i < elf_header.e_phnum; i++, segment++) { if (segment->p_type == PT_NOTE) - res &= process_corefile_note_segment (file, - (bfd_vma) segment->p_offset, - (bfd_vma) segment->p_filesz); + if (! process_notes_at (file, NULL, + (bfd_vma) segment->p_offset, + (bfd_vma) segment->p_filesz)) + res = FALSE; + } + + return res; +} + +static bfd_boolean +process_v850_notes (FILE * file, bfd_vma offset, bfd_vma length) +{ + Elf_External_Note * pnotes; + Elf_External_Note * external; + char * end; + bfd_boolean res = TRUE; + + if (length <= 0) + return FALSE; + + pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length, + _("v850 notes")); + if (pnotes == NULL) + return FALSE; + + external = pnotes; + end = (char*) pnotes + length; + + printf (_("\nDisplaying contents of Renesas V850 notes section at offset 0x%lx with length 0x%lx:\n"), + (unsigned long) offset, (unsigned long) length); + + while ((char *) external + sizeof (Elf_External_Note) < end) + { + Elf_External_Note * next; + Elf_Internal_Note inote; + + inote.type = BYTE_GET (external->type); + inote.namesz = BYTE_GET (external->namesz); + inote.namedata = external->name; + inote.descsz = BYTE_GET (external->descsz); + inote.descdata = inote.namedata + align_power (inote.namesz, 2); + inote.descpos = offset + (inote.descdata - (char *) pnotes); + + if (inote.descdata < (char *) pnotes || inote.descdata >= end) + { + warn (_("Corrupt note: name size is too big: %lx\n"), inote.namesz); + inote.descdata = inote.namedata; + inote.namesz = 0; + } + + next = (Elf_External_Note *) (inote.descdata + align_power (inote.descsz, 2)); + + if ( ((char *) next > end) + || ((char *) next < (char *) pnotes)) + { + warn (_("corrupt descsz found in note at offset 0x%lx\n"), + (unsigned long) ((char *) external - (char *) pnotes)); + warn (_(" type: 0x%lx, namesize: 0x%lx, descsize: 0x%lx\n"), + inote.type, inote.namesz, inote.descsz); + break; + } + + external = next; + + /* Prevent out-of-bounds indexing. */ + if ( inote.namedata + inote.namesz > end + || inote.namedata + inote.namesz < inote.namedata) + { + warn (_("corrupt namesz found in note at offset 0x%lx\n"), + (unsigned long) ((char *) external - (char *) pnotes)); + warn (_(" type: 0x%lx, namesize: 0x%lx, descsize: 0x%lx\n"), + inote.type, inote.namesz, inote.descsz); + break; + } + + printf (" %s: ", get_v850_elf_note_type (inote.type)); + + if (! print_v850_note (& inote)) + { + res = FALSE; + printf ("\n", + inote.namesz, inote.descsz); + } } + free (pnotes); + return res; } -static int +static bfd_boolean process_note_sections (FILE * file) { Elf_Internal_Shdr * section; unsigned long i; - int res = 1; + unsigned int n = 0; + bfd_boolean res = TRUE; for (i = 0, section = section_headers; i < elf_header.e_shnum && section != NULL; i++, section++) - if (section->sh_type == SHT_NOTE) - res &= process_corefile_note_segment (file, - (bfd_vma) section->sh_offset, - (bfd_vma) section->sh_size); + { + if (section->sh_type == SHT_NOTE) + { + if (! process_notes_at (file, section, + (bfd_vma) section->sh_offset, + (bfd_vma) section->sh_size)) + res = FALSE; + n++; + } + + if (( elf_header.e_machine == EM_V800 + || elf_header.e_machine == EM_V850 + || elf_header.e_machine == EM_CYGNUS_V850) + && section->sh_type == SHT_RENESAS_INFO) + { + if (! process_v850_notes (file, + (bfd_vma) section->sh_offset, + (bfd_vma) section->sh_size)) + res = FALSE; + n++; + } + } + + if (n == 0) + /* Try processing NOTE segments instead. */ + return process_corefile_note_segments (file); return res; } -static int +static bfd_boolean process_notes (FILE * file) { /* If we have not been asked to display the notes then do nothing. */ if (! do_notes) - return 1; + return TRUE; if (elf_header.e_type != ET_CORE) return process_note_sections (file); @@ -13736,54 +17735,103 @@ process_notes (FILE * file) return process_corefile_note_segments (file); printf (_("No note segments present in the core file.\n")); - return 1; + return TRUE; } -static int +static unsigned char * +display_public_gnu_attributes (unsigned char * start, + const unsigned char * const end) +{ + printf (_(" Unknown GNU attribute: %s\n"), start); + + start += strnlen ((char *) start, end - start); + display_raw_attribute (start, end); + + return (unsigned char *) end; +} + +static unsigned char * +display_generic_attribute (unsigned char * start, + unsigned int tag, + const unsigned char * const end) +{ + if (tag == 0) + return (unsigned char *) end; + + return display_tag_value (tag, start, end); +} + +static bfd_boolean process_arch_specific (FILE * file) { if (! do_arch) - return 1; + return TRUE; switch (elf_header.e_machine) { + case EM_ARC: + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: + return process_attributes (file, "ARC", SHT_ARC_ATTRIBUTES, + display_arc_attribute, + display_generic_attribute); case EM_ARM: - return process_arm_specific (file); + return process_attributes (file, "aeabi", SHT_ARM_ATTRIBUTES, + display_arm_attribute, + display_generic_attribute); + case EM_MIPS: case EM_MIPS_RS3_LE: return process_mips_specific (file); - break; + + case EM_MSP430: + return process_attributes (file, "mspabi", SHT_MSP430_ATTRIBUTES, + display_msp430x_attribute, + display_generic_attribute); + + case EM_NDS32: + return process_nds32_specific (file); + case EM_PPC: - return process_power_specific (file); - break; + case EM_PPC64: + return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, + display_power_gnu_attribute); + + case EM_S390: + case EM_S390_OLD: + return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, + display_s390_gnu_attribute); + case EM_SPARC: case EM_SPARC32PLUS: case EM_SPARCV9: - return process_sparc_specific (file); - break; + return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, + display_sparc_gnu_attribute); + case EM_TI_C6000: - return process_tic6x_specific (file); - break; - case EM_MSP430: - return process_msp430x_specific (file); + return process_attributes (file, "c6xabi", SHT_C6000_ATTRIBUTES, + display_tic6x_attribute, + display_generic_attribute); + default: - break; + return process_attributes (file, "gnu", SHT_GNU_ATTRIBUTES, + display_public_gnu_attributes, + display_generic_attribute); } - return 1; } -static int +static bfd_boolean get_file_header (FILE * file) { /* Read in the identity array. */ if (fread (elf_header.e_ident, EI_NIDENT, 1, file) != 1) - return 0; + return FALSE; /* Determine how to read the rest of the header. */ switch (elf_header.e_ident[EI_DATA]) { - default: /* fall through */ - case ELFDATANONE: /* fall through */ + default: + case ELFDATANONE: case ELFDATA2LSB: byte_get = byte_get_little_endian; byte_put = byte_put_little_endian; @@ -13803,7 +17851,7 @@ get_file_header (FILE * file) Elf32_External_Ehdr ehdr32; if (fread (ehdr32.e_type, sizeof (ehdr32) - EI_NIDENT, 1, file) != 1) - return 0; + return FALSE; elf_header.e_type = BYTE_GET (ehdr32.e_type); elf_header.e_machine = BYTE_GET (ehdr32.e_machine); @@ -13831,11 +17879,11 @@ get_file_header (FILE * file) { error (_("This instance of readelf has been built without support for a\n\ 64 bit data type and so it cannot read 64 bit ELF files.\n")); - return 0; + return FALSE; } if (fread (ehdr64.e_type, sizeof (ehdr64) - EI_NIDENT, 1, file) != 1) - return 0; + return FALSE; elf_header.e_type = BYTE_GET (ehdr64.e_type); elf_header.e_machine = BYTE_GET (ehdr64.e_machine); @@ -13857,27 +17905,29 @@ get_file_header (FILE * file) /* There may be some extensions in the first section header. Don't bomb if we can't read it. */ if (is_32bit_elf) - get_32bit_section_headers (file, 1); + get_32bit_section_headers (file, TRUE); else - get_64bit_section_headers (file, 1); + get_64bit_section_headers (file, TRUE); } - return 1; + return TRUE; } /* Process one ELF object file according to the command line options. This file may actually be stored in an archive. The file is - positioned at the start of the ELF object. */ + positioned at the start of the ELF object. Returns TRUE if no + problems were encountered, FALSE otherwise. */ -static int +static bfd_boolean process_object (char * file_name, FILE * file) { unsigned int i; + bfd_boolean res = TRUE; if (! get_file_header (file)) { error (_("%s: Failed to read file header\n"), file_name); - return 1; + return FALSE; } /* Initialise per file variables. */ @@ -13911,44 +17961,52 @@ process_object (char * file_name, FILE * file) } if (! process_file_header ()) - return 1; + return FALSE; if (! process_section_headers (file)) { - /* Without loaded section headers we cannot process lots of - things. */ - do_unwind = do_version = do_dump = do_arch = 0; + /* Without loaded section headers we cannot process lots of things. */ + do_unwind = do_version = do_dump = do_arch = FALSE; if (! do_using_dynamic) - do_syms = do_dyn_syms = do_reloc = 0; + do_syms = do_dyn_syms = do_reloc = FALSE; } if (! process_section_groups (file)) - { - /* Without loaded section groups we cannot process unwind. */ - do_unwind = 0; - } + /* Without loaded section groups we cannot process unwind. */ + do_unwind = FALSE; if (process_program_headers (file)) process_dynamic_section (file); + else + res = FALSE; - process_relocs (file); + if (! process_relocs (file)) + res = FALSE; - process_unwind (file); + if (! process_unwind (file)) + res = FALSE; - process_symbol_table (file); + if (! process_symbol_table (file)) + res = FALSE; - process_syminfo (file); + if (! process_syminfo (file)) + res = FALSE; - process_version_sections (file); + if (! process_version_sections (file)) + res = FALSE; - process_section_contents (file); + if (! process_section_contents (file)) + res = FALSE; - process_notes (file); + if (! process_notes (file)) + res = FALSE; - process_gnu_liblist (file); + if (! process_gnu_liblist (file)) + res = FALSE; - process_arch_specific (file); + if (! process_arch_specific (file)) + res = FALSE; if (program_headers) { @@ -14021,21 +18079,22 @@ process_object (char * file_name, FILE * file) free_debug_memory (); - return 0; + return res; } /* Process an ELF archive. - On entry the file is positioned just after the ARMAG string. */ + On entry the file is positioned just after the ARMAG string. + Returns TRUE upon success, FALSE otherwise. */ -static int +static bfd_boolean process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) { struct archive_info arch; struct archive_info nested_arch; size_t got; - int ret; + bfd_boolean ret = TRUE; - show_name = 1; + show_name = TRUE; /* The ARCH structure is used to hold information about this archive. */ arch.file_name = NULL; @@ -14055,7 +18114,7 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) if (setup_archive (&arch, file_name, file, is_thin_archive, do_archive_index) != 0) { - ret = 1; + ret = FALSE; goto out; } @@ -14065,11 +18124,11 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) error (_("%s: unable to dump the index as none was found\n"), file_name); else { - unsigned int i, l; + unsigned long i, l; unsigned long current_pos; - printf (_("Index of archive %s: (%ld entries, 0x%lx bytes in the symbol table)\n"), - file_name, (long) arch.index_num, arch.sym_size); + printf (_("Index of archive %s: (%lu entries, 0x%lx bytes in the symbol table)\n"), + file_name, (unsigned long) arch.index_num, arch.sym_size); current_pos = ftell (file); for (i = l = 0; i < arch.index_num; i++) @@ -14098,10 +18157,12 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) { error (_("%s: end of the symbol table reached before the end of the index\n"), file_name); + ret = FALSE; break; } - printf ("\t%s\n", arch.sym_table + l); - l += strlen (arch.sym_table + l) + 1; + /* PR 17531: file: 0b6630b2. */ + printf ("\t%.*s\n", (int) (arch.sym_size - l), arch.sym_table + l); + l += strnlen (arch.sym_table + l, arch.sym_size - l) + 1; } if (arch.uses_64bit_indicies) @@ -14110,13 +18171,16 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) l += l & 1; if (l < arch.sym_size) - error (_("%s: %ld bytes remain in the symbol table, but without corresponding entries in the index table\n"), - file_name, arch.sym_size - l); + { + error (_("%s: %ld bytes remain in the symbol table, but without corresponding entries in the index table\n"), + file_name, arch.sym_size - l); + ret = FALSE; + } if (fseek (file, current_pos, SEEK_SET) != 0) { error (_("%s: failed to seek back to start of object files in the archive\n"), file_name); - ret = 1; + ret = FALSE; goto out; } } @@ -14126,13 +18190,11 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) && !do_histogram && !do_debugging && !do_arch && !do_notes && !do_section_groups && !do_dyn_syms) { - ret = 0; /* Archive index only. */ + ret = TRUE; /* Archive index only. */ goto out; } } - ret = 0; - while (1) { char * name; @@ -14143,7 +18205,7 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) if (fseek (file, arch.next_arhdr_offset, SEEK_SET) != 0) { error (_("%s: failed to seek to next archive header\n"), file_name); - return 1; + return FALSE; } got = fread (&arch.arhdr, 1, sizeof arch.arhdr, file); if (got != sizeof arch.arhdr) @@ -14151,13 +18213,13 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) if (got == 0) break; error (_("%s: failed to read archive header\n"), file_name); - ret = 1; + ret = FALSE; break; } if (memcmp (arch.arhdr.ar_fmag, ARFMAG, 2) != 0) { error (_("%s: did not find a valid archive header\n"), arch.file_name); - ret = 1; + ret = FALSE; break; } @@ -14171,7 +18233,7 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) if (name == NULL) { error (_("%s: bad archive file name\n"), file_name); - ret = 1; + ret = FALSE; break; } namelen = strlen (name); @@ -14180,7 +18242,7 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) if (qualified_name == NULL) { error (_("%s: bad archive file name\n"), file_name); - ret = 1; + ret = FALSE; break; } @@ -14189,9 +18251,10 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) /* This is a proxy for an external member of a thin archive. */ FILE * member_file; char * member_file_name = adjust_relative_path (file_name, name, namelen); + if (member_file_name == NULL) { - ret = 1; + ret = FALSE; break; } @@ -14200,13 +18263,14 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) { error (_("Input file '%s' is not readable.\n"), member_file_name); free (member_file_name); - ret = 1; + ret = FALSE; break; } archive_file_offset = arch.nested_member_origin; - ret |= process_object (qualified_name, member_file); + if (! process_object (qualified_name, member_file)) + ret = FALSE; fclose (member_file); free (member_file_name); @@ -14218,7 +18282,7 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) { error (_("%s: contains corrupt thin archive: %s\n"), file_name, name); - ret = 1; + ret = FALSE; break; } @@ -14230,18 +18294,20 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) if (fseek (nested_arch.file, archive_file_offset, SEEK_SET) != 0) { error (_("%s: failed to seek to archive member.\n"), nested_arch.file_name); - ret = 1; + ret = FALSE; break; } - ret |= process_object (qualified_name, nested_arch.file); + if (! process_object (qualified_name, nested_arch.file)) + ret = FALSE; } else { archive_file_offset = arch.next_arhdr_offset; arch.next_arhdr_offset += archive_file_size; - ret |= process_object (qualified_name, file); + if (! process_object (qualified_name, file)) + ret = FALSE; } if (dump_sects != NULL) @@ -14263,13 +18329,13 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) return ret; } -static int +static bfd_boolean process_file (char * file_name) { FILE * file; struct stat statbuf; char armag[SARMAG]; - int ret; + bfd_boolean ret = TRUE; if (stat (file_name, &statbuf) < 0) { @@ -14278,33 +18344,41 @@ process_file (char * file_name) else error (_("Could not locate '%s'. System error message: %s\n"), file_name, strerror (errno)); - return 1; + return FALSE; } if (! S_ISREG (statbuf.st_mode)) { error (_("'%s' is not an ordinary file\n"), file_name); - return 1; + return FALSE; } file = fopen (file_name, "rb"); if (file == NULL) { error (_("Input file '%s' is not readable.\n"), file_name); - return 1; + return FALSE; } if (fread (armag, SARMAG, 1, file) != 1) { error (_("%s: Failed to read file's magic number\n"), file_name); fclose (file); - return 1; + return FALSE; } + current_file_size = (bfd_size_type) statbuf.st_size; + if (memcmp (armag, ARMAG, SARMAG) == 0) - ret = process_archive (file_name, file, FALSE); + { + if (! process_archive (file_name, file, FALSE)) + ret = FALSE; + } else if (memcmp (armag, ARMAGT, SARMAG) == 0) - ret = process_archive (file_name, file, TRUE); + { + if ( ! process_archive (file_name, file, TRUE)) + ret = FALSE; + } else { if (do_archive_index) @@ -14313,10 +18387,13 @@ process_file (char * file_name) rewind (file); archive_file_size = archive_file_offset = 0; - ret = process_object (file_name, file); + + if (! process_object (file_name, file)) + ret = FALSE; } fclose (file); + current_file_size = 0; return ret; } @@ -14374,16 +18451,22 @@ main (int argc, char ** argv) } if (optind < (argc - 1)) - show_name = 1; + show_name = TRUE; + else if (optind >= argc) + { + warn (_("Nothing to do.\n")); + usage (stderr); + } - err = 0; + err = FALSE; while (optind < argc) - err |= process_file (argv[optind++]); + if (! process_file (argv[optind++])) + err = TRUE; if (dump_sects != NULL) free (dump_sects); if (cmdline_dump_sects != NULL) free (cmdline_dump_sects); - return err; + return err ? EXIT_FAILURE : EXIT_SUCCESS; }