Handle ELFCLASS32 files for x86-64

src/tools/validator_tools/ncstubout.c

Index: src/tools/validator_tools/ncstubout.c
diff --git a/src/tools/validator_tools/ncstubout.c b/src/tools/validator_tools/ncstubout.c
index 6f719a3c9e330ab60dc6d96484b3876eb517bfec..1a2633a71372af8a6186bf8e8b636ee8da003613 100644
--- a/src/tools/validator_tools/ncstubout.c
+++ b/src/tools/validator_tools/ncstubout.c
@@ -80,18 +80,18 @@ static void CheckBounds(unsigned char *data, size_t data_size,
   CHECK((unsigned char *) ptr + inside_size <= data + data_size);
 }
 
-static Bool FixUpELF(unsigned char *data, size_t data_size) {
-  Elf_Ehdr *header;
+static Bool FixUpELF32(unsigned char *data, size_t data_size) {
+  Elf32_Ehdr *header;
   int index;
   Bool fixed = TRUE;  /* until proven otherwise. */
 
-  header = (Elf_Ehdr *) data;
+  header = (Elf32_Ehdr *) data;
   CheckBounds(data, data_size, header, sizeof(*header));
   CHECK(memcmp(header->e_ident, ELFMAG, strlen(ELFMAG)) == 0);
 
   for (index = 0; index < header->e_shnum; index++) {

[bsy, 2011/10/11 21:21:19]

this relies of sizeof(int) > sizeof(Elf32_Half) which is true for all sane
configs.  if ever equal or less, this is an infinite loop.

-    Elf_Shdr *section = (Elf_Shdr *) (data + header->e_shoff +
-                                      header->e_shentsize * index);
+    Elf32_Shdr *section = (Elf32_Shdr *) (data + header->e_shoff +
+                                          header->e_shentsize * index);
     CheckBounds(data, data_size, section, sizeof(*section));
 
     if ((section->sh_flags & SHF_EXECINSTR) != 0) {
@@ -106,6 +106,42 @@ static Bool FixUpELF(unsigned char *data, size_t data_size) {
   return fixed;
 }
 
+#if NACL_TARGET_SUBARCH == 64
+static Bool FixUpELF64(unsigned char *data, size_t data_size) {
+  Elf64_Ehdr *header;
+  int index;

[bsy, 2011/10/11 21:21:19]

i usually try to avoid "index" as a variable name, since it's also a bsd-ism
function (legacy in posix.1-2001) for strchr.  not that we call index and
shadowing would generate compiler errors etc anyway.  of course, pre-existing
cut-n-paste etc.  sigh.  feel free to ignore.

+  Bool fixed = TRUE;  /* until proven otherwise. */
+
+  header = (Elf64_Ehdr *) data;
+  CheckBounds(data, data_size, header, sizeof(*header));
+  CHECK(memcmp(header->e_ident, ELFMAG, strlen(ELFMAG)) == 0);
+
+  for (index = 0; index < header->e_shnum; index++) {

[bsy, 2011/10/11 21:21:19]

same nit as above.  feel free to ignore.

+    Elf64_Shdr *section = (Elf64_Shdr *) (data + header->e_shoff +
+                                          header->e_shentsize * index);
+    CheckBounds(data, data_size, section, sizeof(*section));
+
+    if ((section->sh_flags & SHF_EXECINSTR) != 0) {
+      CheckBounds(data, data_size,
+                  data + section->sh_offset, section->sh_size);

[bsy, 2011/10/11 21:21:19]

section->sh_offset + section->sh_size can wrap on a 32-bit machine as above.

+      if (!FixUpSection(section->sh_addr,
+                        data + section->sh_offset, section->sh_size)) {
+        fixed = FALSE;
+      }
+    }
+  }
+  return fixed;
+}
+#endif
+
+static Bool FixUpELF(unsigned char *data, size_t data_size) {
+#if NACL_TARGET_SUBARCH == 64
+  if (data_size > EI_CLASS && data[EI_CLASS] == ELFCLASS64)
+    return FixUpELF64(data, data_size);
+#endif
+  return FixUpELF32(data, data_size);
+}
+
 static Bool FixUpELFFile(const char *input_file, const char *output_file) {
   FILE *fp;
   size_t file_size;