Add options for base dir and redirecting files to IRT open resource and use it.

src/untrusted/irt/irt_core_resource.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 <errno.h>
 #include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "native_client/src/untrusted/irt/irt.h"
 #include "native_client/src/untrusted/nacl/syscall_bindings_trampoline.h"
 
+static int nacl_irt_open_resource_remapped(const char *pathname, int *newfd,

[Mark Seaborn, 2014/12/01 20:54:17]

Can you add a comment explaining what this is for?  i.e. Just for testing the
sandboxed translator (specifically the linker) outside of Chromium.

Also say in a sentence what the code does, since it's hard to read the C string
manipulation code.

[jvoung (off chromium), 2014/12/01 22:00:09]

Done.

+                                           const char *base_dir,
+                                           const char *file_remap) {
+  const size_t max_path_len = 2047;
+  char merged_path[2048] = "\0";

[Mark Seaborn, 2014/12/01 20:54:17]

You can declare this and the others closer to where they're used.  (C99 features
are usable here.)

The initialiser here will memset() the full 2k buffer, which is unnecessary.

[jvoung (off chromium), 2014/12/01 22:00:09]

Done.

+  size_t base_len;
+  size_t pathname_len;
+  /*
+   * Map the file name if there is a request to do so. This is for mapping
+   * the PNaCl libpnacl_irt_shim.a -> libpnacl_irt_shim_dummy.a.
+   */
+  if (file_remap) {

[Mark Seaborn, 2014/12/01 20:54:17]

Add "!= NULL"

[jvoung (off chromium), 2014/12/01 22:00:09]

Done.

+    const char *delim_ptr = strchr(file_remap, ':');
+    if (delim_ptr) {

[Mark Seaborn, 2014/12/01 20:54:17]

Add "!= NULL"

[jvoung (off chromium), 2014/12/01 22:00:09]

Done.

+      ptrdiff_t remap_from_len = delim_ptr - file_remap;
+      if (remap_from_len > max_path_len) {
+        errno = ENAMETOOLONG;
+        return -1;
+      }
+      if (strncmp(pathname, file_remap, remap_from_len) == 0 &&
+          strlen(pathname) == remap_from_len) {
+        pathname = delim_ptr + 1;
+      }
+    }
+  }
+  base_len = strnlen(base_dir, max_path_len);
+  pathname_len = strnlen(pathname, max_path_len);
+  if (pathname_len + base_len > max_path_len) {
+    errno = ENAMETOOLONG;

[Mark Seaborn, 2014/12/01 20:54:17]

Suggestion: Would it be easier to use VLAs, malloc(), or C++'s std::string
instead of checking for overflows?

[jvoung (off chromium), 2014/12/01 22:00:10]

Okay, I'll just use malloc.

re: c++'s std::string, SCons has a hack that uses pnacl-clang to link the IRT
core instead of pnacl-clang++, to avoid the libc++ plus pthread dependency.
Perhaps we can revert that hack and just live with the pthread dependency
though.

[Mark Seaborn, 2014/12/02 00:42:07]

Using malloc() is a good compromise, I think. :-)

+    return -1;
+  }
+  strncat(merged_path, base_dir, max_path_len);
+  strncat(merged_path, pathname, max_path_len - base_len);
+  return NACL_GC_WRAP_SYSCALL(NACL_SYSCALL(open)(merged_path, O_RDONLY, 0));
+}
+
 static int nacl_irt_open_resource(const char *pathname, int *newfd) {
-  int rv = NACL_GC_WRAP_SYSCALL(NACL_SYSCALL(open)(pathname, O_RDONLY, 0));
+  char *base_dir = getenv("NACL_IRT_OPEN_RESOURCE_BASE");
+  char *file_remap = getenv("NACL_IRT_OPEN_RESOURCE_REMAP");
+  int rv;
+  if (!base_dir) {

[Mark Seaborn, 2014/12/01 20:54:17]

NaCl style is "if (base_dir == NULL)" (no implicit conversion to bool)

[jvoung (off chromium), 2014/12/01 22:00:09]

Done.

+    rv = NACL_GC_WRAP_SYSCALL(NACL_SYSCALL(open)(pathname, O_RDONLY, 0));
+  } else {
+    rv = nacl_irt_open_resource_remapped(pathname, newfd, base_dir, file_remap);
+  }
   if (rv < 0)
     return -rv;
   *newfd = rv;
   return 0;
 }
 
 const struct nacl_irt_resource_open nacl_irt_resource_open = {
   nacl_irt_open_resource,
 };