Unsigned integer overflows in readelf checks
[deliverable/binutils-gdb.git] / binutils / readelf.c
index 52aebd379137def6011cd2a56e4c4d96bbf5357f..3f424c4e63d6779c27c83a2ad8a0d02217fb696b 100644 (file)
@@ -1,5 +1,5 @@
 /* readelf.c -- display contents of an ELF format file
-   Copyright (C) 1998-2018 Free Software Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
    Originally developed by Eric Youngdale <eric@andante.jic.com>
    Modifications by Nick Clifton <nickc@redhat.com>
@@ -398,10 +398,11 @@ get_data (void *         var,
       return NULL;
     }
 
-  /* Be kind to memory chekers (eg valgrind, address sanitizer) by not
+  /* Be kind to memory checkers (eg valgrind, address sanitizer) by not
      attempting to allocate memory when the read is bound to fail.  */
-  if (amt > filedata->file_size
-      || offset + archive_file_offset + amt > filedata->file_size)
+  if (archive_file_offset > filedata->file_size
+      || offset > filedata->file_size - archive_file_offset
+      || amt > filedata->file_size - archive_file_offset - offset)
     {
       if (reason)
        error (_("Reading %s bytes extends past end of file for %s\n"),
@@ -3404,7 +3405,9 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine)
            case E_MIPS_MACH_9000: strcat (buf, ", 9000"); break;
            case E_MIPS_MACH_LS2E: strcat (buf, ", loongson-2e"); break;
            case E_MIPS_MACH_LS2F: strcat (buf, ", loongson-2f"); break;
-           case E_MIPS_MACH_LS3A: strcat (buf, ", loongson-3a"); break;
+           case E_MIPS_MACH_GS464: strcat (buf, ", gs464"); break;
+           case E_MIPS_MACH_GS464E: strcat (buf, ", gs464e"); break;
+           case E_MIPS_MACH_GS264E: strcat (buf, ", gs264e"); 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;
@@ -3687,6 +3690,8 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine)
                    ? ", uses String instructions" : ", bans String instructions");
          if (e_flags & E_FLAG_RX_V2)
            strcat (buf, ", V2");
+         if (e_flags & E_FLAG_RX_V3)
+           strcat (buf, ", V3");
          break;
 
        case EM_S390:
@@ -3928,6 +3933,7 @@ get_segment_type (Filedata * filedata, unsigned long p_type)
     case PT_GNU_EH_FRAME: return "GNU_EH_FRAME";
     case PT_GNU_STACK: return "GNU_STACK";
     case PT_GNU_RELRO:  return "GNU_RELRO";
+    case PT_GNU_PROPERTY: return "GNU_PROPERTY";
 
     default:
       if (p_type >= PT_GNU_MBIND_LO && p_type <= PT_GNU_MBIND_HI)
@@ -4199,6 +4205,16 @@ get_v850_section_type_name (unsigned int sh_type)
     }
 }
 
+static const char *
+get_riscv_section_type_name (unsigned int sh_type)
+{
+  switch (sh_type)
+    {
+    case SHT_RISCV_ATTRIBUTES:  return "RISCV_ATTRIBUTES";
+    default: return NULL;
+    }
+}
+
 static const char *
 get_section_type_name (Filedata * filedata, unsigned int sh_type)
 {
@@ -4279,6 +4295,9 @@ get_section_type_name (Filedata * filedata, unsigned int sh_type)
            case EM_CYGNUS_V850:
              result = get_v850_section_type_name (sh_type);
              break;
+           case EM_RISCV:
+             result = get_riscv_section_type_name (sh_type);
+             break;
            default:
              result = NULL;
              break;
@@ -4765,12 +4784,12 @@ process_file_header (Filedata * filedata)
              get_elf_class (header->e_ident[EI_CLASS]));
       printf (_("  Data:                              %s\n"),
              get_data_encoding (header->e_ident[EI_DATA]));
-      printf (_("  Version:                           %d %s\n"),
+      printf (_("  Version:                           %d%s\n"),
              header->e_ident[EI_VERSION],
              (header->e_ident[EI_VERSION] == EV_CURRENT
-              ? "(current)"
+              ? _(" (current)")
               : (header->e_ident[EI_VERSION] != EV_NONE
-                 ? _("<unknown: %lx>")
+                 ? _(" <unknown>")
                  : "")));
       printf (_("  OS/ABI:                            %s\n"),
              get_osabi_name (filedata, header->e_ident[EI_OSABI]));
@@ -4781,45 +4800,57 @@ process_file_header (Filedata * filedata)
       printf (_("  Machine:                           %s\n"),
              get_machine_name (header->e_machine));
       printf (_("  Version:                           0x%lx\n"),
-             (unsigned long) header->e_version);
+             header->e_version);
 
       printf (_("  Entry point address:               "));
-      print_vma ((bfd_vma) header->e_entry, PREFIX_HEX);
+      print_vma (header->e_entry, PREFIX_HEX);
       printf (_("\n  Start of program headers:          "));
-      print_vma ((bfd_vma) header->e_phoff, DEC);
+      print_vma (header->e_phoff, DEC);
       printf (_(" (bytes into file)\n  Start of section headers:          "));
-      print_vma ((bfd_vma) header->e_shoff, DEC);
+      print_vma (header->e_shoff, DEC);
       printf (_(" (bytes into file)\n"));
 
       printf (_("  Flags:                             0x%lx%s\n"),
-             (unsigned long) header->e_flags,
+             header->e_flags,
              get_machine_flags (filedata, header->e_flags, header->e_machine));
-      printf (_("  Size of this header:               %ld (bytes)\n"),
-             (long) header->e_ehsize);
-      printf (_("  Size of program headers:           %ld (bytes)\n"),
-             (long) header->e_phentsize);
-      printf (_("  Number of program headers:         %ld"),
-             (long) header->e_phnum);
+      printf (_("  Size of this header:               %u (bytes)\n"),
+             header->e_ehsize);
+      printf (_("  Size of program headers:           %u (bytes)\n"),
+             header->e_phentsize);
+      printf (_("  Number of program headers:         %u"),
+             header->e_phnum);
       if (filedata->section_headers != NULL
          && header->e_phnum == PN_XNUM
          && filedata->section_headers[0].sh_info != 0)
-       printf (" (%ld)", (long) filedata->section_headers[0].sh_info);
+       {
+         header->e_phnum = filedata->section_headers[0].sh_info;
+         printf (" (%u)", header->e_phnum);
+       }
       putc ('\n', stdout);
-      printf (_("  Size of section headers:           %ld (bytes)\n"),
-             (long) header->e_shentsize);
-      printf (_("  Number of section headers:         %ld"),
-             (long) header->e_shnum);
+      printf (_("  Size of section headers:           %u (bytes)\n"),
+             header->e_shentsize);
+      printf (_("  Number of section headers:         %u"),
+             header->e_shnum);
       if (filedata->section_headers != NULL && header->e_shnum == SHN_UNDEF)
-       printf (" (%ld)", (long) filedata->section_headers[0].sh_size);
+       {
+         header->e_shnum = filedata->section_headers[0].sh_size;
+         printf (" (%u)", header->e_shnum);
+       }
       putc ('\n', stdout);
-      printf (_("  Section header string table index: %ld"),
-             (long) header->e_shstrndx);
+      printf (_("  Section header string table index: %u"),
+             header->e_shstrndx);
       if (filedata->section_headers != NULL
          && header->e_shstrndx == (SHN_XINDEX & 0xffff))
-       printf (" (%u)", filedata->section_headers[0].sh_link);
-      else if (header->e_shstrndx != SHN_UNDEF
-              && header->e_shstrndx >= header->e_shnum)
-       printf (_(" <corrupt: out of range>"));
+       {
+         header->e_shstrndx = filedata->section_headers[0].sh_link;
+         printf (" (%u)", header->e_shstrndx);
+       }
+      if (header->e_shstrndx != SHN_UNDEF
+         && header->e_shstrndx >= header->e_shnum)
+       {
+         header->e_shstrndx = SHN_UNDEF;
+         printf (_(" <corrupt: out of range>"));
+       }
       putc ('\n', stdout);
     }
 
@@ -5205,7 +5236,8 @@ process_program_headers (Filedata * filedata)
             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 >= filedata->file_size)
+         if (dynamic_addr > filedata->file_size
+             || dynamic_size > filedata->file_size - dynamic_addr)
            {
              error (_("the dynamic segment offset + size exceeds the size of the file\n"));
              dynamic_addr = dynamic_size = 0;
@@ -6285,14 +6317,21 @@ process_section_headers (Filedata * filedata)
       /* Check the sh_link field.  */
       switch (section->sh_type)
        {
+       case SHT_REL:
+       case SHT_RELA:
+         if (section->sh_link == 0
+             && (filedata->file_header.e_type == ET_EXEC
+                 || filedata->file_header.e_type == ET_DYN))
+           /* A dynamic relocation section where all entries use a
+              zero symbol index need not specify a symtab section.  */
+           break;
+         /* Fall through.  */
        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
+         if (section->sh_link == 0
              || section->sh_link >= filedata->file_header.e_shnum
              || (filedata->section_headers[section->sh_link].sh_type != SHT_SYMTAB
                  && filedata->section_headers[section->sh_link].sh_type != SHT_DYNSYM))
@@ -6306,7 +6345,7 @@ process_section_headers (Filedata * filedata)
        case SHT_GNU_verneed:
        case SHT_GNU_verdef:
        case SHT_GNU_LIBLIST:
-         if (section->sh_link < 1
+         if (section->sh_link == 0
              || section->sh_link >= filedata->file_header.e_shnum
              || filedata->section_headers[section->sh_link].sh_type != SHT_STRTAB)
            warn (_("[%2u]: Link field (%u) should index a string section.\n"),
@@ -6339,29 +6378,24 @@ process_section_headers (Filedata * filedata)
        {
        case SHT_REL:
        case SHT_RELA:
-         if (section->sh_info < 1
+         if (section->sh_info == 0
+             && (filedata->file_header.e_type == ET_EXEC
+                 || filedata->file_header.e_type == ET_DYN))
+           /* Dynamic relocations apply to segments, so they do not
+              need to specify the section they relocate.  */
+           break;
+         if (section->sh_info == 0
              || section->sh_info >= filedata->file_header.e_shnum
              || (filedata->section_headers[section->sh_info].sh_type != SHT_PROGBITS
                  && filedata->section_headers[section->sh_info].sh_type != SHT_NOBITS
                  && filedata->section_headers[section->sh_info].sh_type != SHT_NOTE
                  && filedata->section_headers[section->sh_info].sh_type != SHT_INIT_ARRAY
+                 && filedata->section_headers[section->sh_info].sh_type != SHT_FINI_ARRAY
+                 && filedata->section_headers[section->sh_info].sh_type != SHT_PREINIT_ARRAY
                  /* FIXME: Are other section types valid ?  */
                  && filedata->section_headers[section->sh_info].sh_type < SHT_LOOS))
-           {
-             if (section->sh_info == 0
-                 && (filedata->file_header.e_type == ET_EXEC
-                     || filedata->file_header.e_type == ET_DYN
-                     /* These next two tests may be redundant, but
-                        they have been left in for paranoia's sake.  */
-                     || streq (SECTION_NAME (section), ".rel.dyn")
-                     || streq (SECTION_NAME (section), ".rela.dyn")))
-               /* Dynamic relocations apply to segments, not sections, so
-                  they do not need an sh_info value.  */
-               ;
-             else
-               warn (_("[%2u]: Info field (%u) should index a relocatable section.\n"),
-                     i, section->sh_info);
-           }
+           warn (_("[%2u]: Info field (%u) should index a relocatable section.\n"),
+                 i, section->sh_info);
          break;
 
        case SHT_DYNAMIC:
@@ -7581,14 +7615,14 @@ slurp_ia64_unwind_table (Filedata *                  filedata,
 
       for (rp = rela; rp < rela + nrelas; ++rp)
        {
-         relname = elf_ia64_reloc_type (get_reloc_type (filedata, rp->r_info));
-         sym = aux->symtab + get_reloc_symindex (rp->r_info);
+         unsigned int sym_ndx;
+         unsigned int r_type = get_reloc_type (filedata, rp->r_info);
+         relname = elf_ia64_reloc_type (r_type);
 
          /* PR 17531: file: 9fa67536.  */
          if (relname == NULL)
            {
-             warn (_("Skipping unknown relocation type: %u\n"),
-                   get_reloc_type (filedata, rp->r_info));
+             warn (_("Skipping unknown relocation type: %u\n"), r_type);
              continue;
            }
 
@@ -7607,6 +7641,15 @@ slurp_ia64_unwind_table (Filedata *                  filedata,
              continue;
            }
 
+         sym_ndx = get_reloc_symindex (rp->r_info);
+         if (sym_ndx >= aux->nsyms)
+           {
+             warn (_("Skipping reloc with invalid symbol index: %u\n"),
+                   sym_ndx);
+             continue;
+           }
+         sym = aux->symtab + sym_ndx;
+
          switch (rp->r_offset / eh_addr_size % 3)
            {
            case 0:
@@ -8037,19 +8080,40 @@ slurp_hppa_unwind_table (Filedata *                  filedata,
 
       for (rp = rela; rp < rela + nrelas; ++rp)
        {
-         relname = elf_hppa_reloc_type (get_reloc_type (filedata, rp->r_info));
-         sym = aux->symtab + get_reloc_symindex (rp->r_info);
+         unsigned int sym_ndx;
+         unsigned int r_type = get_reloc_type (filedata, rp->r_info);
+         relname = elf_hppa_reloc_type (r_type);
+
+         if (relname == NULL)
+           {
+             warn (_("Skipping unknown relocation type: %u\n"), r_type);
+             continue;
+           }
 
          /* R_PARISC_SEGREL32 or R_PARISC_SEGREL64.  */
          if (! const_strneq (relname, "R_PARISC_SEGREL"))
            {
-             warn (_("Skipping unexpected relocation type %s\n"), relname);
+             warn (_("Skipping unexpected relocation type: %s\n"), relname);
              continue;
            }
 
          i = rp->r_offset / unw_ent_size;
+         if (i >= aux->table_len)
+           {
+             warn (_("Skipping reloc with overlarge offset: %lx\n"), i);
+             continue;
+           }
 
-         switch ((rp->r_offset % unw_ent_size) / eh_addr_size)
+         sym_ndx = get_reloc_symindex (rp->r_info);
+         if (sym_ndx >= aux->nsyms)
+           {
+             warn (_("Skipping reloc with invalid symbol index: %u\n"),
+                   sym_ndx);
+             continue;
+           }
+         sym = aux->symtab + sym_ndx;
+
+         switch ((rp->r_offset % unw_ent_size) / 4)
            {
            case 0:
              aux->table[i].start.section = sym->st_shndx;
@@ -8117,7 +8181,7 @@ hppa_process_unwind (Filedata * filedata)
     {
       if (streq (SECTION_NAME (sec), ".PARISC.unwind"))
        {
-         unsigned long num_unwind = sec->sh_size / (2 * eh_addr_size + 8);
+         unsigned long num_unwind = sec->sh_size / 16;
 
          printf (ngettext ("\nUnwind section '%s' at offset 0x%lx "
                            "contains %lu entry:\n",
@@ -8790,21 +8854,28 @@ decode_tic6x_unwind_bytecode (Filedata *                 filedata,
            }
 
          printf (_("pop frame {"));
-         reg = nregs - 1;
-         for (i = i * 2; i > 0; i--)
+         if (nregs == 0)
            {
-             if (regpos[reg].offset == i - 1)
+             printf (_("*corrupt* - no registers specified"));
+           }
+         else
+           {
+             reg = nregs - 1;
+             for (i = i * 2; i > 0; i--)
                {
-                 name = tic6x_unwind_regnames[regpos[reg].reg];
-                 if (reg > 0)
-                   reg--;
-               }
-             else
-               name = _("[pad]");
+                 if (regpos[reg].offset == i - 1)
+                   {
+                     name = tic6x_unwind_regnames[regpos[reg].reg];
+                     if (reg > 0)
+                       reg--;
+                   }
+                 else
+                   name = _("[pad]");
 
-             fputs (name, stdout);
-             if (i > 1)
-               printf (", ");
+                 fputs (name, stdout);
+                 if (i > 1)
+                   printf (", ");
+               }
            }
 
          printf ("}");
@@ -11076,11 +11147,16 @@ get_ia64_symbol_other (Filedata * filedata, unsigned int other)
 static const char *
 get_ppc64_symbol_other (unsigned int other)
 {
-  if (PPC64_LOCAL_ENTRY_OFFSET (other) != 0)
+  if ((other & ~STO_PPC64_LOCAL_MASK) != 0)
+    return NULL;
+
+  other >>= STO_PPC64_LOCAL_BIT;
+  if (other <= 6)
     {
       static char buf[32];
-      snprintf (buf, sizeof buf, _("<localentry>: %d"),
-               PPC64_LOCAL_ENTRY_OFFSET (other));
+      if (other >= 2)
+       other = ppc64_decode_local_entry (other);
+      snprintf (buf, sizeof buf, _("<localentry>: %d"), other);
       return buf;
     }
   return NULL;
@@ -11283,6 +11359,7 @@ get_symbol_version_string (Filedata *                   filedata,
   unsigned char data[2];
   unsigned short vers_data;
   unsigned long offset;
+  unsigned short max_vd_ndx;
 
   if (!is_dynsym
       || version_info[DT_VERSIONTAGIDX (DT_VERSYM)] == 0)
@@ -11300,6 +11377,8 @@ get_symbol_version_string (Filedata *                   filedata,
   if ((vers_data & VERSYM_HIDDEN) == 0 && vers_data == 0)
     return NULL;
 
+  max_vd_ndx = 0;
+
   /* 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
@@ -11342,6 +11421,9 @@ get_symbol_version_string (Filedata *                   filedata,
              ivd.vd_flags = BYTE_GET (evd.vd_flags);
            }
 
+         if ((ivd.vd_ndx & VERSYM_VERSION) > max_vd_ndx)
+           max_vd_ndx = ivd.vd_ndx & VERSYM_VERSION;
+
          off += ivd.vd_next;
        }
       while (ivd.vd_ndx != (vers_data & VERSYM_VERSION) && ivd.vd_next != 0);
@@ -11433,6 +11515,9 @@ get_symbol_version_string (Filedata *                   filedata,
          return (ivna.vna_name < strtab_size
                  ? strtab + ivna.vna_name : _("<corrupt>"));
        }
+      else if ((max_vd_ndx || (vers_data & VERSYM_VERSION) != 1)
+              && (vers_data & VERSYM_VERSION) > max_vd_ndx)
+       return _("<corrupt>");
     }
   return NULL;
 }
@@ -12356,7 +12441,8 @@ is_32bit_abs_reloc (Filedata * filedata, unsigned int reloc_type)
     case EM_68HC12:
       return reloc_type == 6; /* R_M68HC11_32.  */
     case EM_S12Z:
-      return reloc_type == 6; /* R_S12Z_EXT32.  */
+      return reloc_type == 7 || /* R_S12Z_EXT32 */
+       reloc_type == 6;        /* R_S12Z_CW32.  */
     case EM_MCORE:
       return reloc_type == 1; /* R_MCORE_ADDR32.  */
     case EM_CYGNUS_MEP:
@@ -12508,6 +12594,8 @@ is_32bit_pcrel_reloc (Filedata * filedata, unsigned int reloc_type)
       return reloc_type == 26; /* R_PPC_REL32.  */
     case EM_PPC64:
       return reloc_type == 26; /* R_PPC64_REL32.  */
+    case EM_RISCV:
+      return reloc_type == 57; /* R_RISCV_32_PCREL.  */
     case EM_S390_OLD:
     case EM_S390:
       return reloc_type == 5;  /* R_390_PC32.  */
@@ -13002,7 +13090,6 @@ apply_relocations (Filedata *                 filedata,
 {
   Elf_Internal_Shdr * relsec;
   unsigned char * end = start + size;
-  bfd_boolean res = TRUE;
 
   if (relocs_return != NULL)
     {
@@ -13131,7 +13218,6 @@ apply_relocations (Filedata *                 filedata,
                warn (_("unable to apply unsupported reloc type %d to section %s\n"),
                      reloc_type, printable_section_name (filedata, section));
              prev_reloc = reloc_type;
-             res = FALSE;
              continue;
            }
 
@@ -13141,7 +13227,6 @@ apply_relocations (Filedata *                 filedata,
              warn (_("skipping invalid relocation offset 0x%lx in section %s\n"),
                    (unsigned long) rp->r_offset,
                    printable_section_name (filedata, section));
-             res = FALSE;
              continue;
            }
 
@@ -13150,7 +13235,6 @@ apply_relocations (Filedata *                 filedata,
            {
              warn (_("skipping invalid relocation symbol index 0x%lx in section %s\n"),
                    sym_index, printable_section_name (filedata, section));
-             res = FALSE;
              continue;
            }
          sym = symtab + sym_index;
@@ -13176,7 +13260,6 @@ apply_relocations (Filedata *                 filedata,
                    get_symbol_type (filedata, ELF_ST_TYPE (sym->st_info)),
                    printable_section_name (filedata, relsec),
                    (long int)(rp - relocs));
-             res = FALSE;
              continue;
            }
 
@@ -13243,7 +13326,7 @@ apply_relocations (Filedata *                 filedata,
       break;
     }
 
-  return res;
+  return TRUE;
 }
 
 #ifdef SUPPORT_DISASSEMBLY
@@ -13369,12 +13452,6 @@ dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata)
                    printable_section_name (filedata, section), chdr.ch_type);
              return FALSE;
            }
-         else if (chdr.ch_addralign != section->sh_addralign)
-           {
-             warn (_("compressed section '%s' is corrupted\n"),
-                   printable_section_name (filedata, section));
-             return FALSE;
-           }
          uncompressed_size = chdr.ch_size;
          start += compression_header_size;
          new_size -= compression_header_size;
@@ -13516,12 +13593,6 @@ dump_section_as_bytes (Elf_Internal_Shdr *  section,
                    printable_section_name (filedata, section), chdr.ch_type);
              return FALSE;
            }
-         else if (chdr.ch_addralign != section->sh_addralign)
-           {
-             warn (_("compressed section '%s' is corrupted\n"),
-                   printable_section_name (filedata, section));
-             return FALSE;
-           }
          uncompressed_size = chdr.ch_size;
          start += compression_header_size;
          new_size -= compression_header_size;
@@ -13691,12 +13762,6 @@ load_specific_debug_section (enum dwarf_section_display_enum  debug,
                    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;
@@ -15194,7 +15259,7 @@ display_raw_attribute (unsigned char * p, unsigned char const * const end)
   unsigned long addr = 0;
   size_t bytes = end - p;
 
-  assert (end > p);
+  assert (end >= p);
   while (bytes)
     {
       int j;
@@ -15319,6 +15384,88 @@ display_msp430x_attribute (unsigned char * p,
   return p;
 }
 
+struct riscv_attr_tag_t {
+  const char *name;
+  int tag;
+};
+
+static struct riscv_attr_tag_t riscv_attr_tag[] =
+{
+#define T(tag) {"Tag_RISCV_" #tag, Tag_RISCV_##tag}
+  T(arch),
+  T(priv_spec),
+  T(priv_spec_minor),
+  T(priv_spec_revision),
+  T(unaligned_access),
+  T(stack_align),
+#undef T
+};
+
+static unsigned char *
+display_riscv_attribute (unsigned char *p,
+                        const unsigned char * const end)
+{
+  unsigned int len;
+  int val;
+  int tag;
+  struct riscv_attr_tag_t *attr = NULL;
+  unsigned i;
+
+  tag = read_uleb128 (p, &len, end);
+  p += len;
+
+  /* Find the name of attribute. */
+  for (i = 0; i < ARRAY_SIZE (riscv_attr_tag); i++)
+    {
+      if (riscv_attr_tag[i].tag == tag)
+       {
+         attr = &riscv_attr_tag[i];
+         break;
+       }
+    }
+
+  if (attr)
+    printf ("  %s: ", attr->name);
+  else
+    return display_tag_value (tag, p, end);
+
+  switch (tag)
+    {
+    case Tag_RISCV_priv_spec:
+    case Tag_RISCV_priv_spec_minor:
+    case Tag_RISCV_priv_spec_revision:
+      val = read_uleb128 (p, &len, end);
+      p += len;
+      printf (_("%d\n"), val);
+      break;
+    case Tag_RISCV_unaligned_access:
+      val = read_uleb128 (p, &len, end);
+      p += len;
+      switch (val)
+       {
+       case 0:
+         printf (_("No unaligned access\n"));
+         break;
+       case 1:
+         printf (_("Unaligned access\n"));
+         break;
+       }
+      break;
+    case Tag_RISCV_stack_align:
+      val = read_uleb128 (p, &len, end);
+      p += len;
+      printf (_("%d-bytes\n"), val);
+      break;
+    case Tag_RISCV_arch:
+      p = display_tag_value (-1, p, end);
+      break;
+    default:
+      return display_tag_value (tag, p, end);
+    }
+
+  return p;
+}
+
 static bfd_boolean
 process_attributes (Filedata * filedata,
                    const char * public_name,
@@ -15625,6 +15772,12 @@ print_mips_ases (unsigned int mask)
     fputs ("\n\tGINV ASE", stdout);
   if (mask & AFL_ASE_LOONGSON_MMI)
     fputs ("\n\tLoongson MMI ASE", stdout);
+  if (mask & AFL_ASE_LOONGSON_CAM)
+    fputs ("\n\tLoongson CAM ASE", stdout);
+  if (mask & AFL_ASE_LOONGSON_EXT)
+    fputs ("\n\tLoongson EXT ASE", stdout);
+  if (mask & AFL_ASE_LOONGSON_EXT2)
+    fputs ("\n\tLoongson EXT2 ASE", stdout);
   if (mask == 0)
     fprintf (stdout, "\n\t%s", _("None"));
   else if ((mask & ~AFL_ASE_MASK) != 0)
@@ -15651,9 +15804,6 @@ print_mips_isa_ext (unsigned int isa_ext)
     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;
@@ -16929,9 +17079,88 @@ get_gnu_elf_note_type (unsigned e_type)
     }
 }
 
+static void
+decode_x86_compat_isa (unsigned int bitmask)
+{
+  while (bitmask)
+    {
+      unsigned int bit = bitmask & (- bitmask);
+
+      bitmask &= ~ bit;
+      switch (bit)
+       {
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_486:
+         printf ("i486");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_586:
+         printf ("586");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_686:
+         printf ("686");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_SSE:
+         printf ("SSE");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_SSE2:
+         printf ("SSE2");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_SSE3:
+         printf ("SSE3");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_SSSE3:
+         printf ("SSSE3");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_SSE4_1:
+         printf ("SSE4_1");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_SSE4_2:
+         printf ("SSE4_2");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX:
+         printf ("AVX");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX2:
+         printf ("AVX2");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX512F:
+         printf ("AVX512F");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX512CD:
+         printf ("AVX512CD");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX512ER:
+         printf ("AVX512ER");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX512PF:
+         printf ("AVX512PF");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX512VL:
+         printf ("AVX512VL");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX512DQ:
+         printf ("AVX512DQ");
+         break;
+       case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX512BW:
+         printf ("AVX512BW");
+         break;
+       default:
+         printf (_("<unknown: %x>"), bit);
+         break;
+       }
+      if (bitmask)
+       printf (", ");
+    }
+}
+
 static void
 decode_x86_isa (unsigned int bitmask)
 {
+  if (!bitmask)
+    {
+      printf (_("<None>"));
+      return;
+    }
+
   while (bitmask)
     {
       unsigned int bit = bitmask & (- bitmask);
@@ -16939,25 +17168,81 @@ decode_x86_isa (unsigned int 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 (_("<unknown: %x>"), bit); break;
+       case GNU_PROPERTY_X86_ISA_1_CMOV:
+         printf ("CMOV");
+         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_FMA:
+         printf ("FMA");
+         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;
+       case GNU_PROPERTY_X86_ISA_1_AVX512_4FMAPS:
+         printf ("AVX512_4FMAPS");
+         break;
+       case GNU_PROPERTY_X86_ISA_1_AVX512_4VNNIW:
+         printf ("AVX512_4VNNIW");
+         break;
+       case GNU_PROPERTY_X86_ISA_1_AVX512_BITALG:
+         printf ("AVX512_BITALG");
+         break;
+       case GNU_PROPERTY_X86_ISA_1_AVX512_IFMA:
+         printf ("AVX512_IFMA");
+         break;
+       case GNU_PROPERTY_X86_ISA_1_AVX512_VBMI:
+         printf ("AVX512_VBMI");
+         break;
+       case GNU_PROPERTY_X86_ISA_1_AVX512_VBMI2:
+         printf ("AVX512_VBMI2");
+         break;
+       case GNU_PROPERTY_X86_ISA_1_AVX512_VNNI:
+         printf ("AVX512_VNNI");
+         break;
+       default:
+         printf (_("<unknown: %x>"), bit);
+         break;
        }
       if (bitmask)
        printf (", ");
@@ -16965,8 +17250,14 @@ decode_x86_isa (unsigned int bitmask)
 }
 
 static void
-decode_x86_feature (unsigned int type, unsigned int bitmask)
+decode_x86_feature_1 (unsigned int bitmask)
 {
+  if (!bitmask)
+    {
+      printf (_("<None>"));
+      return;
+    }
+
   while (bitmask)
     {
       unsigned int bit = bitmask & (- bitmask);
@@ -16975,26 +17266,65 @@ decode_x86_feature (unsigned int type, unsigned int bitmask)
       switch (bit)
        {
        case GNU_PROPERTY_X86_FEATURE_1_IBT:
-         switch (type)
-           {
-           case GNU_PROPERTY_X86_FEATURE_1_AND:
-             printf ("IBT");
-             break;
-           default:
-             /* This should never happen.  */
-             abort ();
-           }
+         printf ("IBT");
          break;
        case GNU_PROPERTY_X86_FEATURE_1_SHSTK:
-         switch (type)
-           {
-           case GNU_PROPERTY_X86_FEATURE_1_AND:
-             printf ("SHSTK");
-             break;
-           default:
-             /* This should never happen.  */
-             abort ();
-           }
+         printf ("SHSTK");
+         break;
+       default:
+         printf (_("<unknown: %x>"), bit);
+         break;
+       }
+      if (bitmask)
+       printf (", ");
+    }
+}
+
+static void
+decode_x86_feature_2 (unsigned int bitmask)
+{
+  if (!bitmask)
+    {
+      printf (_("<None>"));
+      return;
+    }
+
+  while (bitmask)
+    {
+      unsigned int bit = bitmask & (- bitmask);
+
+      bitmask &= ~ bit;
+      switch (bit)
+       {
+       case GNU_PROPERTY_X86_FEATURE_2_X86:
+         printf ("x86");
+         break;
+       case GNU_PROPERTY_X86_FEATURE_2_X87:
+         printf ("x87");
+         break;
+       case GNU_PROPERTY_X86_FEATURE_2_MMX:
+         printf ("MMX");
+         break;
+       case GNU_PROPERTY_X86_FEATURE_2_XMM:
+         printf ("XMM");
+         break;
+       case GNU_PROPERTY_X86_FEATURE_2_YMM:
+         printf ("YMM");
+         break;
+       case GNU_PROPERTY_X86_FEATURE_2_ZMM:
+         printf ("ZMM");
+         break;
+       case GNU_PROPERTY_X86_FEATURE_2_FXSR:
+         printf ("FXSR");
+         break;
+       case GNU_PROPERTY_X86_FEATURE_2_XSAVE:
+         printf ("XSAVE");
+         break;
+       case GNU_PROPERTY_X86_FEATURE_2_XSAVEOPT:
+         printf ("XSAVEOPT");
+         break;
+       case GNU_PROPERTY_X86_FEATURE_2_XSAVEC:
+         printf ("XSAVEC");
          break;
        default:
          printf (_("<unknown: %x>"), bit);
@@ -17050,30 +17380,89 @@ print_gnu_property_note (Filedata * filedata, Elf_Internal_Note * pnote)
              || filedata->file_header.e_machine == EM_IAMCU
              || filedata->file_header.e_machine == EM_386)
            {
+             unsigned int bitmask;
+
+             if (datasz == 4)
+               bitmask = byte_get (ptr, 4);
+             else
+               bitmask = 0;
+
              switch (type)
                {
                case GNU_PROPERTY_X86_ISA_1_USED:
-                 printf ("x86 ISA used: ");
                  if (datasz != 4)
-                   printf (_("<corrupt length: %#x> "), datasz);
+                   printf (_("x86 ISA used: <corrupt length: %#x> "),
+                           datasz);
                  else
-                   decode_x86_isa (byte_get (ptr, 4));
+                   {
+                     printf ("x86 ISA used: ");
+                     decode_x86_isa (bitmask);
+                   }
                  goto next;
 
                case GNU_PROPERTY_X86_ISA_1_NEEDED:
-                 printf ("x86 ISA needed: ");
                  if (datasz != 4)
-                   printf (_("<corrupt length: %#x> "), datasz);
+                   printf (_("x86 ISA needed: <corrupt length: %#x> "),
+                           datasz);
                  else
-                   decode_x86_isa (byte_get (ptr, 4));
+                   {
+                     printf ("x86 ISA needed: ");
+                     decode_x86_isa (bitmask);
+                   }
                  goto next;
 
                case GNU_PROPERTY_X86_FEATURE_1_AND:
-                 printf ("x86 feature: ");
                  if (datasz != 4)
-                   printf (_("<corrupt length: %#x> "), datasz);
+                   printf (_("x86 feature: <corrupt length: %#x> "),
+                           datasz);
+                 else
+                   {
+                     printf ("x86 feature: ");
+                     decode_x86_feature_1 (bitmask);
+                   }
+                 goto next;
+
+               case GNU_PROPERTY_X86_FEATURE_2_USED:
+                 if (datasz != 4)
+                   printf (_("x86 feature used: <corrupt length: %#x> "),
+                           datasz);
                  else
-                   decode_x86_feature (type, byte_get (ptr, 4));
+                   {
+                     printf ("x86 feature used: ");
+                     decode_x86_feature_2 (bitmask);
+                   }
+                 goto next;
+
+               case GNU_PROPERTY_X86_FEATURE_2_NEEDED:
+                 if (datasz != 4)
+                   printf (_("x86 feature needed: <corrupt length: %#x> "), datasz);
+                 else
+                   {
+                     printf ("x86 feature needed: ");
+                     decode_x86_feature_2 (bitmask);
+                   }
+                 goto next;
+
+               case GNU_PROPERTY_X86_COMPAT_ISA_1_USED:
+                 if (datasz != 4)
+                   printf (_("x86 ISA used: <corrupt length: %#x> "),
+                           datasz);
+                 else
+                   {
+                     printf ("x86 ISA used: ");
+                     decode_x86_compat_isa (bitmask);
+                   }
+                 goto next;
+
+               case GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED:
+                 if (datasz != 4)
+                   printf (_("x86 ISA needed: <corrupt length: %#x> "),
+                           datasz);
+                 else
+                   {
+                     printf ("x86 ISA needed: ");
+                     decode_x86_compat_isa (bitmask);
+                   }
                  goto next;
 
                default:
@@ -18361,7 +18750,7 @@ process_notes_at (Filedata *           filedata,
         one version of Linux (RedHat 6.0) generates corefiles that don't
         comply with the ELF spec by failing to include the null byte in
         namesz.  */
-      if (inote.namedata[inote.namesz - 1] != '\0')
+      if (inote.namesz > 0 && inote.namedata[inote.namesz - 1] != '\0')
        {
          if ((size_t) (inote.descdata - inote.namedata) == inote.namesz)
            {
@@ -18611,6 +19000,11 @@ process_arch_specific (Filedata * filedata)
                                display_msp430x_attribute,
                                display_generic_attribute);
 
+    case EM_RISCV:
+     return process_attributes (filedata, "riscv", SHT_RISCV_ATTRIBUTES,
+                               display_riscv_attribute,
+                               display_generic_attribute);
+
     case EM_NDS32:
       return process_nds32_specific (filedata);
 
@@ -19113,7 +19507,7 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
       /* Read the next archive header.  */
       if (fseek (filedata->handle, arch.next_arhdr_offset, SEEK_SET) != 0)
         {
-          error (_("%s: failed to seek to next archive header\n"), filedata->file_name);
+          error (_("%s: failed to seek to next archive header\n"), arch.file_name);
           return FALSE;
         }
       got = fread (&arch.arhdr, 1, sizeof arch.arhdr, filedata->handle);
@@ -19121,7 +19515,10 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
         {
           if (got == 0)
            break;
-          error (_("%s: failed to read archive header\n"), filedata->file_name);
+         /* PR 24049 - we cannot use filedata->file_name as this will
+            have already been freed.  */
+         error (_("%s: failed to read archive header\n"), arch.file_name);
+           
           ret = FALSE;
           break;
         }
@@ -19141,7 +19538,7 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
       name = get_archive_member_name (&arch, &nested_arch);
       if (name == NULL)
        {
-         error (_("%s: bad archive file name\n"), filedata->file_name);
+         error (_("%s: bad archive file name\n"), arch.file_name);
          ret = FALSE;
          break;
        }
@@ -19150,7 +19547,7 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
       qualified_name = make_qualified_name (&arch, &nested_arch, name);
       if (qualified_name == NULL)
        {
-         error (_("%s: bad archive file name\n"), filedata->file_name);
+         error (_("%s: bad archive file name\n"), arch.file_name);
          ret = FALSE;
          break;
        }
@@ -19196,7 +19593,7 @@ process_archive (Filedata * filedata, bfd_boolean is_thin_archive)
          if (nested_arch.file == NULL)
            {
              error (_("%s: contains corrupt thin archive: %s\n"),
-                    filedata->file_name, name);
+                    qualified_name, name);
              ret = FALSE;
              break;
            }
This page took 0.04049 seconds and 4 git commands to generate.