Handle ELFCLASS32 files for x86-64

src/trusted/service_runtime/nacl_error_code.c

 /*
  * Copyright (c) 2011 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 
 #include "native_client/src/shared/platform/nacl_log.h"
 
@@ skipping 12 matching lines @@
     case LOAD_DUP_LOAD_MODULE:  /* -R: nexe supplied by RPC, but only once! */
       return "Multiple LoadModule RPCs";
     case LOAD_DUP_START_MODULE:  /* -X: implies StartModule RPC, but once! */
       return "Multiple StartModule RPCs";
     case LOAD_OPEN_ERROR:
       return "Cannot open NaCl module file";
     case LOAD_READ_ERROR:
       return "Cannot read file";
     case LOAD_TOO_MANY_PROG_HDRS:
       return "Too many program header entries in ELF file";
-    case LOAD_PROG_HDR_SIZE_TOO_SMALL:
-      return "ELF program header size too small";
+    case LOAD_BAD_PHENTSIZE:
+      return "ELF program header size wrong";
     case LOAD_BAD_ELF_MAGIC:
       return "Bad ELF header magic number";
     case LOAD_NOT_32_BIT:
       return "Not a 32-bit ELF file";
     case LOAD_NOT_64_BIT:
       return "Not a 64-bit ELF file";
     case LOAD_BAD_ABI:
       return "ELF file has unexpected OS ABI";
     case LOAD_NOT_EXEC:
       return "ELF file type not executable";
@@ skipping 82 matching lines @@
     case LOAD_REQUIRED_SEG_MISSING:
       return "ELF executable missing a required segment (text)";
     case LOAD_SEGMENT_BAD_PARAM:
       return "ELF executable segment header parameter error";
     case LOAD_VALIDATION_FAILED:
       return "Validation failure. File violates Native Client safety rules.";
     case LOAD_UNIMPLEMENTED:
       return "Not implemented for this architecture.";
     case SRT_NO_SEG_SEL:
       return "Service Runtime: cannot allocate segment selector";
+    case LOAD_BAD_EHSIZE:
+      return "ELFCLASS64 file header has wrong e_ehsize value";
+    case LOAD_EHDR_OVERFLOW:
+      return "ELFCLASS64 file header has fields that overflow 32 bits";
+    case LOAD_PHDR_OVERFLOW:
+      return "ELFCLASS64 program header has fields that overflow 32 bits";
   }
 
   /*
    * do not use default case label, to make sure that the compiler
    * will generate a warning with -Wswitch-enum for new codes
    * introduced in nacl_error_codes.h for which there is no
    * corresponding entry here.  instead, we pretend that fall-through
    * from the switch is possible.  (otherwise -W complains control
    * reaches end of non-void function.)
    */
   return "BAD ERROR CODE";
 }