Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/validator/ncfileutil.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.
  */
 
 /*
  * ncfileutil.c - open an executable file. FOR TESTING ONLY.
  */
 
@@ skipping 168 matching lines @@
     return -1;
   }
   /* TODO(karl) Remove the cast to size_t, or verify value in range. */
   nread = readat(ncf, fd, ncf->sheaders, (off_t) shsize, (off_t) h.e_shoff);
   if (nread < 0 || (size_t) nread < shsize) {
     ncf->error_fn("nc_load(%s): could not read section headers\n",
                   ncf->fname);
     return -1;
   }
 
+  /* Keep a copy of the header around for the validator */
+  ncf->eheader = calloc(1, sizeof(Elf_Ehdr));
+  if (ncf->eheader == NULL) {
+    ncf->error_fn("nc_load(%s): calloc(1, sizeof(Elf_Ehdr)) failed\n",
+                  ncf->fname);
+    return -1;
+  }
+  *ncf->eheader = h; /* save the copy */
+
   /* success! */
   return 0;
 }
 
 ncfile *nc_loadfile_depending(const char *filename,
                               nc_loadfile_error_fn error_fn) {
   ncfile *ncf;
   int fd;
   int rdflags = O_RDONLY | _O_BINARY;
   fd = OPEN(filename, rdflags);
   if (fd < 0) return NULL;
 
   /* Allocate the ncfile structure */
   ncf = calloc(1, sizeof(ncfile));
   if (ncf == NULL) return NULL;
   ncf->size = 0;
   ncf->data = NULL;
   ncf->fname = filename;
   if (error_fn == NULL) {
     ncf->error_fn = NcLoadFilePrintError;
   } else {
     ncf->error_fn = error_fn;
   }
 
   if (nc_load(ncf, fd) < 0) {
     close(fd);
-    free(ncf);
+    nc_freefile(ncf);
     return NULL;
   }
   close(fd);
   return ncf;
 }
 
 ncfile *nc_loadfile(const char *filename) {
   return nc_loadfile_depending(filename, NULL);
 }
 
 ncfile *nc_loadfile_with_error_fn(const char *filename,
                                   nc_loadfile_error_fn error_fn) {
   return nc_loadfile_depending(filename, error_fn);
 }
 
 
 void nc_freefile(ncfile *ncf) {
-  if (ncf->data != NULL) free(ncf->data);
+  if (ncf == NULL) return;
+  free(ncf->data);
+  free(ncf->eheader);
+  free(ncf->pheaders);
+  free(ncf->sheaders);
   free(ncf);
 }
 
 /***********************************************************************/
 
 void GetVBaseAndLimit(ncfile *ncf, NaClPcAddress *vbase,
                       NaClPcAddress *vlimit) {
   int ii;
   /* TODO(karl) - Define so constant applies to 64-bit pc address. */
   NaClPcAddress base = 0xffffffff;
   NaClPcAddress limit = 0;
 
   for (ii = 0; ii < ncf->shnum; ii++) {
     if ((ncf->sheaders[ii].sh_flags & SHF_EXECINSTR) == SHF_EXECINSTR) {
       if (ncf->sheaders[ii].sh_addr < base) base = ncf->sheaders[ii].sh_addr;
       if (ncf->sheaders[ii].sh_addr + ncf->sheaders[ii].sh_size > limit)
         limit = ncf->sheaders[ii].sh_addr + ncf->sheaders[ii].sh_size;
     }
   }
   *vbase = base;
   *vlimit = limit;
 }