commit fb62c0aa93364992d2aef5b81b2f79c306efac47
author Christopher Ferris <cferris@google.com> Tue Jan 05 18:44:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 05 18:44:00 2016 +0000
tree fc46b6ce787754a768a5f2209c1f01cd1e816c63
parent 81b66f466548a012546c663bde62e4fae0756d29
parent 66013410e88ae0014d4af305fbcc4993463095d1

Fix bad elf data handling.
am: 66013410e8

* commit '66013410e88ae0014d4af305fbcc4993463095d1':
  Fix bad elf data handling.

src/dwarf/Gfind_proc_info-lsb.c

diff --git a/src/dwarf/Gfind_proc_info-lsb.c b/src/dwarf/Gfind_proc_info-lsb.c
index f74b734..bc04cd1 100644
--- a/src/dwarf/Gfind_proc_info-lsb.c
+++ b/src/dwarf/Gfind_proc_info-lsb.c
@@ -112,6 +112,10 @@
   
   if (fread (&ehdr, sizeof (Elf_W (Ehdr)), 1, f) != 1)
     goto file_error;
+
+  /* Verify this is actually an elf file. */
+  if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0)
+    goto file_error;
   
   shstrndx = ehdr.e_shstrndx;
   
@@ -120,7 +124,8 @@
 
   fseek (f, ehdr.e_shoff, SEEK_SET);
   sec_hdrs = calloc (ehdr.e_shnum, sizeof (Elf_W (Shdr)));
-  if (sec_hdrs == NULL || fread (sec_hdrs, sizeof (Elf_W (Shdr)), ehdr.e_shnum, f) != ehdr.e_shnum)
+  if (sec_hdrs == NULL || fread (sec_hdrs, sizeof (Elf_W (Shdr)), ehdr.e_shnum, f) != ehdr.e_shnum
+      || shstrndx >= ehdr.e_shnum)
     goto file_error;
 
   Debug (4, "loading string table of size %ld\n",