commit 12ba7e51d9c4f6d8c1fa5627f638b291520a7025
author Dimitry Ivanov <dimitry@google.com> Fri Jul 22 22:44:53 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 22 22:44:53 2016 +0000
tree b35abfc21da98db55ba92b8f2274168574f9a93d
parent 420d02c56d5d73bede85a840a6496679b3f10ad0
parent c73eec159f287ce8911cfcfd122e24c37d584eb9

Merge "Add sanity checks for e_shentsize and e_shstrndx"

linker/linker_phdr.cpp

diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp
index a7af82f..ebc3166 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -245,6 +245,17 @@
     return false;
   }
 
+  if (header_.e_shentsize != sizeof(ElfW(Shdr))) {
+    DL_ERR("\"%s\" has unsupported e_shentsize: 0x%x (expected 0x%zx)",
+           name_.c_str(), header_.e_shentsize, sizeof(ElfW(Shdr)));
+    return false;
+  }
+
+  if (header_.e_shstrndx == 0) {
+    DL_ERR("\"%s\" has invalid e_shstrndx", name_.c_str());
+    return false;
+  }
+
   return true;
 }