src/

2005-06-09  Roland McGrath  <roland@redhat.com>

	* readelf.c (handle_dynamic, handle_symtab): Check for bogus sh_link.

	(handle_verneed, handle_verdef, handle_versym, handle_hash): Likewise.

	(handle_scngrp): Check for bogus sh_info.

	* strip.c (handle_elf): Check for bogus values in sh_link, sh_info,

	st_shndx, e_shstrndx, and SHT_GROUP or SHT_SYMTAB_SHNDX data.

	Don't use assert on input values, instead bail with "illformed" error.

2005-05-17  Jakub Jelinek  <jakub@redhat.com>

libelf/

	* elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header

	table fits into object's bounds.

	* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to

	elf->map_address.  Check if first section header fits into object's

	bounds.

	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)):

	Check if section header table fits into object's bounds.

	* elf_begin.c (get_shnum): Ensure section headers fits into

	object's bounds.

	(file_read_elf): Make sure scncnt is small enough to allocate both

	ElfXX_Shdr and Elf_Scn array.  Make sure section and program header

	tables fit into object's bounds.  Avoid memory leak on failure.

src/

	* elflint.c (check_hash): Don't check entries beyond end of section.

	(check_note): Don't crash if gelf_rawchunk fails.

	(section_name): Return <invalid> if gelf_getshdr returns NULL.

2005-05-14  Jakub Jelinek  <jakub@redhat.com>

libelf/

	* libelfP.h (INVALID_NDX): Define.

	* gelf_getdyn.c (gelf_getdyn): Use it.  Remove ndx < 0 test if any.

	* gelf_getlib.c (gelf_getlib): Likewise.

	* gelf_getmove.c (gelf_getmove): Likewise.

	* gelf_getrel.c (gelf_getrel): Likewise.

	* gelf_getrela.c (gelf_getrela): Likewise.

	* gelf_getsym.c (gelf_getsym): Likewise.

	* gelf_getsyminfo.c (gelf_getsyminfo): Likewise.

	* gelf_getsymshndx.c (gelf_getsymshndx): Likewise.

	* gelf_getversym.c (gelf_getversym): Likewise.

	* gelf_update_dyn.c (gelf_update_dyn): Likewise.

	* gelf_update_lib.c (gelf_update_lib): Likewise.

	* gelf_update_move.c (gelf_update_move): Likewise.

	* gelf_update_rel.c (gelf_update_rel): Likewise.

	* gelf_update_rela.c (gelf_update_rela): Likewise.

	* gelf_update_sym.c (gelf_update_sym): Likewise.

	* gelf_update_syminfo.c (gelf_update_syminfo): Likewise.

	* gelf_update_symshndx.c (gelf_update_symshndx): Likewise.

	* gelf_update_versym.c (gelf_update_versym): Likewise.

	* elf_newscn.c (elf_newscn): Check for overflow.

	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise.

	(__elfw2(LIBELFBITS,updatefile)): Likewise.

	* elf_begin.c (file_read_elf): Likewise.

	* elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise.

	* elf_getarsym.c (elf_getarsym): Likewise.

	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise.

src/

	* elflint.c (section_name): Return "<invalid>" instead of

	crashing on invalid section name.

	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,

	check_symtab_shndx, check_hash, check_versym): Robustify.

--- elfutils-0.127/src/readelf.c.robustify

+++ elfutils-0.127/src/readelf.c

@@ -958,6 +958,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G

   Elf32_Word *grpref = (Elf32_Word *) data->d_buf;

   GElf_Sym sym_mem;

+  GElf_Sym *sym = gelf_getsym (symdata, shdr->sh_info, &sym_mem);

+

   printf ((grpref[0] & GRP_COMDAT)

 	  ? ngettext ("\

 \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",

@@ -970,8 +972,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G

 		      data->d_size / sizeof (Elf32_Word) - 1),

 	  elf_ndxscn (scn),

 	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name),

-	  elf_strptr (ebl->elf, symshdr->sh_link,

-		      gelf_getsym (symdata, shdr->sh_info, &sym_mem)->st_name)

+	  (sym == NULL ? NULL

+	   : elf_strptr (ebl->elf, symshdr->sh_link, sym->st_name))

 	  ?: gettext ("<INVALID SYMBOL>"),

 	  data->d_size / sizeof (Elf32_Word) - 1);

@@ -1122,7 +1124,8 @@ static void

 handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)

 {

   int class = gelf_getclass (ebl->elf);

-  GElf_Shdr glink;

+  GElf_Shdr glink_mem;

+  GElf_Shdr *glink;

   Elf_Data *data;

   size_t cnt;

   size_t shstrndx;

@@ -1137,6 +1140,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 

     error (EXIT_FAILURE, 0,

 	   gettext ("cannot get section header string table index"));

+  glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), &glink_mem);

+  if (glink == NULL)

+    error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),

+	   elf_ndxscn (scn));

+

   printf (ngettext ("\

 \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",

 		    "\

@@ -1146,9 +1154,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 

 	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,

 	  shdr->sh_offset,

 	  (int) shdr->sh_link,

-	  elf_strptr (ebl->elf, shstrndx,

-		      gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

-				    &glink)->sh_name));

+	  elf_strptr (ebl->elf, shstrndx, glink->sh_name));

   fputs_unlocked (gettext ("  Type              Value\n"), stdout);

   for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)

@@ -1666,6 +1672,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G

     error (EXIT_FAILURE, 0,

 	   gettext ("cannot get section header string table index"));

+  GElf_Shdr glink_mem;

+  GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

+				   &glink_mem);

+  if (glink == NULL)

+    error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),

+	   elf_ndxscn (scn));

+

   /* Now we can compute the number of entries in the section.  */

   unsigned int nsyms = data->d_size / (class == ELFCLASS32

 				       ? sizeof (Elf32_Sym)

@@ -1676,15 +1689,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G

 		    nsyms),

 	  (unsigned int) elf_ndxscn (scn),

 	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);

-  GElf_Shdr glink;

   printf (ngettext (" %lu local symbol  String table: [%2u] '%s'\n",

 		    " %lu local symbols  String table: [%2u] '%s'\n",

 		    shdr->sh_info),

 	  (unsigned long int) shdr->sh_info,

 	  (unsigned int) shdr->sh_link,

-	  elf_strptr (ebl->elf, shstrndx,

-		      gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

-				    &glink)->sh_name));

+	  elf_strptr (ebl->elf, shstrndx, glink->sh_name));

   fputs_unlocked (class == ELFCLASS32

 		  ? gettext ("\

@@ -1920,7 +1930,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 

     error (EXIT_FAILURE, 0,

 	   gettext ("cannot get section header string table index"));

-  GElf_Shdr glink;

+  GElf_Shdr glink_mem;

+  GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

+				   &glink_mem);

+  if (glink == NULL)

+    error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),

+	   elf_ndxscn (scn));

+

   printf (ngettext ("\

 \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",

 		    "\

@@ -1931,9 +1947,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 

 	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,

 	  shdr->sh_offset,

 	  (unsigned int) shdr->sh_link,

-	  elf_strptr (ebl->elf, shstrndx,

-		      gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

-				    &glink)->sh_name));

+	  elf_strptr (ebl->elf, shstrndx, glink->sh_name));

   unsigned int offset = 0;

   for (int cnt = shdr->sh_info; --cnt >= 0; )

@@ -1986,8 +2000,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G

     error (EXIT_FAILURE, 0,

 	   gettext ("cannot get section header string table index"));

+  GElf_Shdr glink_mem;

+  GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

+				   &glink_mem);

+  if (glink == NULL)

+    error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),

+	   elf_ndxscn (scn));

+

   int class = gelf_getclass (ebl->elf);

-  GElf_Shdr glink;

   printf (ngettext ("\

 \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",

 		    "\

@@ -1999,9 +2019,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G

 	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,

 	  shdr->sh_offset,

 	  (unsigned int) shdr->sh_link,

-	  elf_strptr (ebl->elf, shstrndx,

-		      gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

-				    &glink)->sh_name));

+	  elf_strptr (ebl->elf, shstrndx, glink->sh_name));

   unsigned int offset = 0;

   for (int cnt = shdr->sh_info; --cnt >= 0; )

@@ -2263,8 +2281,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G

       filename = NULL;

     }

+  GElf_Shdr glink_mem;

+  GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

+				   &glink_mem);

+  if (glink == NULL)

+    error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),

+	   elf_ndxscn (scn));

+

   /* Print the header.  */

-  GElf_Shdr glink;

   printf (ngettext ("\

 \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'",

 		    "\

@@ -2276,9 +2300,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G

 	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,

 	  shdr->sh_offset,

 	  (unsigned int) shdr->sh_link,

-	  elf_strptr (ebl->elf, shstrndx,

-		      gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

-				    &glink)->sh_name));

+	  elf_strptr (ebl->elf, shstrndx, glink->sh_name));

   /* Now we can finally look at the actual contents of this section.  */

   for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)

@@ -2330,7 +2352,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,

   for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)

     ++counts[lengths[cnt]];

-  GElf_Shdr glink;

+  GElf_Shdr glink_mem;

+  GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf,

+					       shdr->sh_link),

+				   &glink_mem);

+  if (glink == NULL)

+    {

+      error (0, 0, gettext ("invalid sh_link value in section %Zu"),

+	     elf_ndxscn (scn));

+      return;

+    }

+

   printf (ngettext ("\

 \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",

 		    "\

@@ -2343,9 +2375,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,

 	  shdr->sh_addr,

 	  shdr->sh_offset,

 	  (unsigned int) shdr->sh_link,

-	  elf_strptr (ebl->elf, shstrndx,

-		      gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),

-				    &glink)->sh_name));

+	  elf_strptr (ebl->elf, shstrndx, glink->sh_name));

   if (extrastr != NULL)

     fputs (extrastr, stdout);

@@ -3655,6 +3685,16 @@ print_debug_aranges_section (Ebl *ebl __

       return;

     }

+  GElf_Shdr glink_mem;

+  GElf_Shdr *glink;

+  glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), &glink_mem);

+  if (glink == NULL)

+    {

+      error (0, 0, gettext ("invalid sh_link value in section %Zu"),

+	     elf_ndxscn (scn));

+      return;

+    }

+

   printf (ngettext ("\

 \nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n",

 		    "\

--- elfutils-0.128/src/strip.c.orig

+++ elfutils-0.128/src/strip.c

@@ -413,6 +413,7 @@ handle_elf (int fd, Elf *elf, const char

   Elf_Data debuglink_crc_data;

   bool any_symtab_changes = false;

   Elf_Data *shstrtab_data = NULL;

+  size_t shdridx = 0;

   /* Create the full name of the file.  */

   if (prefix != NULL)

@@ -543,6 +544,11 @@ handle_elf (int fd, Elf *elf, const char

       goto fail_close;

     }

+  if (shstrndx >= shnum)

+    goto illformed;

+

+#define elf_assert(test) do { if (!(test)) goto illformed; } while (0)

+

   /* Storage for section information.  We leave room for two more

      entries since we unconditionally create a section header string

      table.  Maybe some weird tool created an ELF file without one.

@@ -564,7 +570,7 @@ handle_elf (int fd, Elf *elf, const char

     {

       /* This should always be true (i.e., there should not be any

 	 holes in the numbering).  */

-      assert (elf_ndxscn (scn) == cnt);

+      elf_assert (elf_ndxscn (scn) == cnt);

       shdr_info[cnt].scn = scn;

@@ -577,6 +583,7 @@ handle_elf (int fd, Elf *elf, const char

 					shdr_info[cnt].shdr.sh_name);

       if (shdr_info[cnt].name == NULL)

 	{

+	illformed:

 	  error (0, 0, gettext ("illformed file '%s'"), fname);

 	  goto fail_close;

 	}

@@ -586,6 +593,8 @@ handle_elf (int fd, Elf *elf, const char

       /* Remember the shdr.sh_link value.  */

       shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link;

+      if (shdr_info[cnt].old_sh_link >= shnum)

+	goto illformed;

       /* Sections in files other than relocatable object files which

 	 are not loaded can be freely moved by us.  In relocatable

@@ -598,7 +607,7 @@ handle_elf (int fd, Elf *elf, const char

 	 appropriate reference.  */

       if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX))

 	{

-	  assert (shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx == 0);

+	  elf_assert (shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx == 0);

 	  shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt;

 	}

       else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP))

@@ -615,7 +624,12 @@ handle_elf (int fd, Elf *elf, const char

 	  for (inner = 1;

 	       inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word);

 	       ++inner)

+	    {

+	      if (grpref[inner] < shnum)

 	    shdr_info[grpref[inner]].group_idx = cnt;

+	      else

+		goto illformed;

+	    }

 	  if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0))

 	    /* If the section group contains only one element and this

@@ -626,7 +640,7 @@ handle_elf (int fd, Elf *elf, const char

 	}

       else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym))

 	{

-	  assert (shdr_info[shdr_info[cnt].shdr.sh_link].version_idx == 0);

+	  elf_assert (shdr_info[shdr_info[cnt].shdr.sh_link].version_idx == 0);

 	  shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt;

 	}

@@ -634,7 +648,7 @@ handle_elf (int fd, Elf *elf, const char

 	 discarded right away.  */

       if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0)

 	{

-	  assert (shdr_info[cnt].group_idx != 0);

+	  elf_assert (shdr_info[cnt].group_idx != 0);

 	  if (shdr_info[shdr_info[cnt].group_idx].idx == 0)

 	    {

@@ -709,11 +723,15 @@ handle_elf (int fd, Elf *elf, const char

 	    {

 	      /* If a relocation section is marked as being removed make

 		 sure the section it is relocating is removed, too.  */

-	      if ((shdr_info[cnt].shdr.sh_type == SHT_REL

+	      if (shdr_info[cnt].shdr.sh_type == SHT_REL

 		   || shdr_info[cnt].shdr.sh_type == SHT_RELA)

-		  && shdr_info[shdr_info[cnt].shdr.sh_info].idx != 0)

+		{

+		  if (shdr_info[cnt].shdr.sh_info >= shnum)

+		    goto illformed;

+		  else if (shdr_info[shdr_info[cnt].shdr.sh_info].idx != 0)

 		shdr_info[cnt].idx = 1;

 	    }

+	    }

 	  if (shdr_info[cnt].idx == 1)

 	    {

@@ -738,7 +756,7 @@ handle_elf (int fd, Elf *elf, const char

 		  if (shdr_info[cnt].symtab_idx != 0

 		      && shdr_info[shdr_info[cnt].symtab_idx].data == NULL)

 		    {

-		      assert (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB);

+		      elf_assert (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB);

 		      shdr_info[shdr_info[cnt].symtab_idx].data

 			= elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,

@@ -778,6 +796,9 @@ handle_elf (int fd, Elf *elf, const char

 		      else if (scnidx == SHN_XINDEX)

 			scnidx = xndx;

+		      if (scnidx >= shnum)

+			goto illformed;

+

 		      if (shdr_info[scnidx].idx == 0)

 			{

 			  /* Mark this section as used.  */

@@ -809,12 +830,16 @@ handle_elf (int fd, Elf *elf, const char

 		}

 	      /* Handle references through sh_info.  */

-	      if (SH_INFO_LINK_P (&shdr_info[cnt].shdr)

-		  && shdr_info[shdr_info[cnt].shdr.sh_info].idx == 0)

+	      if (SH_INFO_LINK_P (&shdr_info[cnt].shdr))

+		{

+		  if (shdr_info[cnt].shdr.sh_info >= shnum)

+		    goto illformed;

+		  else if ( shdr_info[shdr_info[cnt].shdr.sh_info].idx == 0)

 		{

 		  shdr_info[shdr_info[cnt].shdr.sh_info].idx = 1;

 		  changes |= shdr_info[cnt].shdr.sh_info < cnt;

 		}

+		}

 	      /* Mark the section as investigated.  */

 	      shdr_info[cnt].idx = 2;

@@ -953,7 +978,7 @@ handle_elf (int fd, Elf *elf, const char

 	  error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),

 		 elf_errmsg (-1));

-	assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx);

+	elf_assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx);

 	/* Add this name to the section header string table.  */

 	shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);

@@ -990,7 +1015,7 @@ handle_elf (int fd, Elf *elf, const char

 	error (EXIT_FAILURE, 0,

 	       gettext ("while create section header section: %s"),

 	       elf_errmsg (-1));

-      assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx);

+      elf_assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx);

       shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);

       if (shdr_info[cnt].data == NULL)

@@ -1021,7 +1046,7 @@ handle_elf (int fd, Elf *elf, const char

     }

   /* Index of the section header table in the shdr_info array.  */

-  size_t shdridx = cnt;

+  shdridx = cnt;

   /* Add the section header string table section name.  */

   shdr_info[cnt].se = ebl_strtabadd (shst, ".shstrtab", 10);

@@ -1046,7 +1071,7 @@ handle_elf (int fd, Elf *elf, const char

     error (EXIT_FAILURE, 0,

 	   gettext ("while create section header section: %s"),

 	   elf_errmsg (-1));

-  assert (elf_ndxscn (shdr_info[cnt].newscn) == idx);

+  elf_assert (elf_ndxscn (shdr_info[cnt].newscn) == idx);

   /* Finalize the string table and fill in the correct indices in the

      section headers.  */

@@ -1136,20 +1161,20 @@ handle_elf (int fd, Elf *elf, const char

 		    shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,

 					     NULL);

-		    assert ((versiondata->d_size / sizeof (Elf32_Word))

+		    elf_assert ((versiondata->d_size / sizeof (Elf32_Word))

 			    >= shdr_info[cnt].data->d_size / elsize);

 		  }

 		if (shdr_info[cnt].version_idx != 0)

 		  {

-		    assert (shdr_info[cnt].shdr.sh_type == SHT_DYNSYM);

+		    elf_assert (shdr_info[cnt].shdr.sh_type == SHT_DYNSYM);

 		    /* This section has associated version

 		       information.  We have to modify that

 		       information, too.  */

 		    versiondata = elf_getdata (shdr_info[shdr_info[cnt].version_idx].scn,

 					       NULL);

-		    assert ((versiondata->d_size / sizeof (GElf_Versym))

+		    elf_assert ((versiondata->d_size / sizeof (GElf_Versym))

 			    >= shdr_info[cnt].data->d_size / elsize);

 		  }

@@ -1204,7 +1229,7 @@ handle_elf (int fd, Elf *elf, const char

 		      sec = shdr_info[sym->st_shndx].idx;

 		    else

 		      {

-			assert (shndxdata != NULL);

+			elf_assert (shndxdata != NULL);

 			sec = shdr_info[xshndx].idx;

 		      }

@@ -1225,7 +1250,7 @@ handle_elf (int fd, Elf *elf, const char

 			    nxshndx = sec;

 			  }

-			assert (sec < SHN_LORESERVE || shndxdata != NULL);

+			elf_assert (sec < SHN_LORESERVE || shndxdata != NULL);

 			if ((inner != destidx || nshndx != sym->st_shndx

 			     || (shndxdata != NULL && nxshndx != xshndx))

@@ -1248,7 +1273,7 @@ handle_elf (int fd, Elf *elf, const char

 		    else

 		      /* This is a section symbol for a section which has

 			 been removed.  */

-		      assert (GELF_ST_TYPE (sym->st_info) == STT_SECTION);

+		      elf_assert (GELF_ST_TYPE (sym->st_info) == STT_SECTION);

 		  }

 		if (destidx != inner)

@@ -1441,11 +1466,11 @@ handle_elf (int fd, Elf *elf, const char

 		    {

 		      GElf_Sym sym_mem;

 		      GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);

-		      assert (sym != NULL);

+		      elf_assert (sym != NULL);

 		      const char *name = elf_strptr (elf, strshndx,

 						     sym->st_name);

-		      assert (name != NULL);

+		      elf_assert (name != NULL);

 		      size_t hidx = elf_hash (name) % nbucket;

 		      if (bucket[hidx] == 0)

@@ -1464,7 +1489,7 @@ handle_elf (int fd, Elf *elf, const char

 	      else

 		{

 		  /* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */

-		  assert (shdr_info[cnt].shdr.sh_entsize

+		  elf_assert (shdr_info[cnt].shdr.sh_entsize

 			  == sizeof (Elf64_Xword));

 		  Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;

@@ -1495,11 +1520,11 @@ handle_elf (int fd, Elf *elf, const char

 		    {

 		      GElf_Sym sym_mem;

 		      GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);

-		      assert (sym != NULL);

+		      elf_assert (sym != NULL);

 		      const char *name = elf_strptr (elf, strshndx,

 						     sym->st_name);

-		      assert (name != NULL);

+		      elf_assert (name != NULL);

 		      size_t hidx = elf_hash (name) % nbucket;

 		      if (bucket[hidx] == 0)

--- elfutils-0.127/src/elflint.c.robustify

+++ elfutils-0.127/src/elflint.c

@@ -123,6 +123,9 @@ static uint32_t shstrndx;

 /* Array to count references in section groups.  */

 static int *scnref;

+/* Number of sections.  */

+static unsigned int shnum;

+

 int

 main (int argc, char *argv[])

@@ -312,10 +315,19 @@ section_name (Ebl *ebl, int idx)

 {

   GElf_Shdr shdr_mem;

   GElf_Shdr *shdr;

+  const char *ret;

+

+  if ((unsigned int) idx > shnum)

+    return "<invalid>";

   shdr = gelf_getshdr (elf_getscn (ebl->elf, idx), &shdr_mem);

+  if (shdr == NULL)

+    return "<invalid>";

-  return elf_strptr (ebl->elf, shstrndx, shdr->sh_name);

+  ret = elf_strptr (ebl->elf, shstrndx, shdr->sh_name);

+  if (ret == NULL)

+    return "<invalid>";

+  return ret;

 }

@@ -337,10 +349,6 @@ static const int valid_e_machine[] =

   (sizeof (valid_e_machine) / sizeof (valid_e_machine[0]))

-/* Number of sections.  */

-static unsigned int shnum;

-

-

 static void

 check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size)

 {

@@ -603,7 +611,8 @@ section [%2d] '%s': symbol table cannot 

 	  }

       }

-  if (shdr->sh_entsize != gelf_fsize (ebl->elf, ELF_T_SYM, 1, EV_CURRENT))

+  size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_SYM, 1, EV_CURRENT);

+  if (shdr->sh_entsize != sh_entsize)

     ERROR (gettext ("\

 section [%2zu] '%s': entry size is does not match ElfXX_Sym\n"),

 	   cnt, section_name (ebl, cnt));

@@ -641,7 +650,7 @@ section [%2d] '%s': XINDEX for zeroth en

 	       xndxscnidx, section_name (ebl, xndxscnidx));

     }

-  for (cnt = 1; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)

+  for (cnt = 1; cnt < shdr->sh_size / sh_entsize; ++cnt)

     {

       sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx);

       if (sym == NULL)

@@ -659,7 +668,8 @@ section [%2d] '%s': symbol %zu: invalid 

       else

 	{

 	  name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name);

-	  assert (name != NULL);

+	  assert (name != NULL

+		  || strshdr->sh_type != SHT_STRTAB);

 	}

       if (sym->st_shndx == SHN_XINDEX)

@@ -981,9 +991,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e

     {

       GElf_Shdr rcshdr_mem;

       const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem);

-      assert (rcshdr != NULL);

-      if (rcshdr->sh_type == SHT_DYNAMIC)

+      if (rcshdr == NULL)

+	break;

+

+      if (rcshdr->sh_type == SHT_DYNAMIC && rcshdr->sh_entsize)

 	{

 	  /* Found the dynamic section.  Look through it.  */

 	  Elf_Data *d = elf_getdata (scn, NULL);

@@ -993,7 +1005,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e

 	    {

 	      GElf_Dyn dyn_mem;

 	      GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem);

-	      assert (dyn != NULL);

+

+	      if (dyn == NULL)

+		break;

 	      if (dyn->d_tag == DT_RELCOUNT)

 		{

@@ -1007,7 +1021,9 @@ section [%2d] '%s': DT_RELCOUNT used for

 		      /* Does the number specified number of relative

 			 relocations exceed the total number of

 			 relocations?  */

-		      if (dyn->d_un.d_val > shdr->sh_size / shdr->sh_entsize)

+		      if (shdr->sh_entsize != 0

+			  && dyn->d_un.d_val > (shdr->sh_size

+						/ shdr->sh_entsize))

 			ERROR (gettext ("\

 section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"),

 			       idx, section_name (ebl, idx),

@@ -1167,7 +1183,8 @@ section [%2d] '%s': no relocations for m

 	}

     }

-  if (shdr->sh_entsize != gelf_fsize (ebl->elf, reltype, 1, EV_CURRENT))

+  size_t sh_entsize = gelf_fsize (ebl->elf, reltype, 1, EV_CURRENT);

+  if (shdr->sh_entsize != sh_entsize)

     ERROR (gettext (reltype == ELF_T_RELA ? "\

 section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\

 section [%2d] '%s': section entry size does not match ElfXX_Rel\n"),

@@ -1389,7 +1406,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G

   Elf_Data *symdata = elf_getdata (symscn, NULL);

   enum load_state state = state_undecided;

-  for (size_t cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)

+  size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_RELA, 1, EV_CURRENT);

+  for (size_t cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt)

     {

       GElf_Rela rela_mem;

       GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem);

@@ -1439,7 +1457,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE

   Elf_Data *symdata = elf_getdata (symscn, NULL);

   enum load_state state = state_undecided;

-  for (size_t cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)

+  size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_REL, 1, EV_CURRENT);

+  for (size_t cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt)

     {

       GElf_Rel rel_mem;

       GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem);

@@ -1543,7 +1562,8 @@ section [%2d] '%s': referenced as string

 	   shdr->sh_link, section_name (ebl, shdr->sh_link),

 	   idx, section_name (ebl, idx));

-  if (shdr->sh_entsize != gelf_fsize (ebl->elf, ELF_T_DYN, 1, EV_CURRENT))

+  size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_DYN, 1, EV_CURRENT);

+  if (shdr->sh_entsize != sh_entsize)

     ERROR (gettext ("\

 section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"),

 	   idx, section_name (ebl, idx));

@@ -1553,7 +1573,7 @@ section [%2d] '%s': section entry size d

 	   idx, section_name (ebl, idx));

   bool non_null_warned = false;

-  for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)

+  for (cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt)

     {

       GElf_Dyn dyn_mem;

       GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem);

@@ -1834,6 +1854,8 @@ section [%2d] '%s': entry size does not 

 	   idx, section_name (ebl, idx));

   if (symshdr != NULL

+      && shdr->sh_entsize

+      && symshdr->sh_entsize

       && (shdr->sh_size / shdr->sh_entsize

 	  < symshdr->sh_size / symshdr->sh_entsize))

     ERROR (gettext ("\

@@ -1860,6 +1882,12 @@ section [%2d] '%s': extended section ind

     }