diff options
author | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 01:28:07 +0000 |
---|---|---|
committer | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 01:28:07 +0000 |
commit | 59d816b0141785fda252decfcdfb2f35a40da991 (patch) | |
tree | 5f894afd515ea58ffcb6a880b74b097a39c5cc9b /sandbox | |
parent | ae100e6994a304739d95ac3b1b625a054704c907 (diff) | |
download | chromium_src-59d816b0141785fda252decfcdfb2f35a40da991.zip chromium_src-59d816b0141785fda252decfcdfb2f35a40da991.tar.gz chromium_src-59d816b0141785fda252decfcdfb2f35a40da991.tar.bz2 |
Share the zygote's fopen overrides with nacl_helper.
This will allow ChromeOS's version of NSS to initialize inside of nacl_helper
without killing the process, which in turn allows validation caching to be
enabled on ChromeOS.
BUG= https://code.google.com/p/chromium/issues/detail?id=134538
TEST= none
Review URL: https://chromiumcodereview.appspot.com/10736017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
-rw-r--r-- | sandbox/linux/services/libc_urandom_override.cc | 166 | ||||
-rw-r--r-- | sandbox/linux/services/libc_urandom_override.h | 18 | ||||
-rw-r--r-- | sandbox/sandbox_linux.gypi | 14 |
3 files changed, 198 insertions, 0 deletions
diff --git a/sandbox/linux/services/libc_urandom_override.cc b/sandbox/linux/services/libc_urandom_override.cc new file mode 100644 index 0000000..14ece95 --- /dev/null +++ b/sandbox/linux/services/libc_urandom_override.cc @@ -0,0 +1,166 @@ +// Copyright (c) 2012 The Chromium 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 "sandbox/linux/services/libc_urandom_override.h" + +#include <dlfcn.h> +#include <pthread.h> +#include <stdio.h> +#include <sys/stat.h> + +#include "base/eintr_wrapper.h" +#include "base/logging.h" +#include "base/rand_util.h" + +// Note: this file is used by the zygote and nacl_helper. + +namespace sandbox { + +// With SELinux we can carve out a precise sandbox, so we don't have to play +// with intercepting libc calls. +#if !defined(CHROMIUM_SELINUX) + +static bool g_override_urandom = false; + +void InitLibcUrandomOverrides() { + // Make sure /dev/urandom is open. + base::GetUrandomFD(); + g_override_urandom = true; +} + +// TODO(sergeyu): Currently this code doesn't work properly under ASAN +// - it crashes content_unittests. Make sure it works properly and +// enable it here. http://crbug.com/123263 +#if !defined(ADDRESS_SANITIZER) + +static const char kUrandomDevPath[] = "/dev/urandom"; + +typedef FILE* (*FopenFunction)(const char* path, const char* mode); +typedef int (*XstatFunction)(int version, const char *path, struct stat *buf); +typedef int (*Xstat64Function)(int version, const char *path, + struct stat64 *buf); + +static pthread_once_t g_libc_file_io_funcs_guard = PTHREAD_ONCE_INIT; +static FopenFunction g_libc_fopen; +static FopenFunction g_libc_fopen64; +static XstatFunction g_libc_xstat; +static Xstat64Function g_libc_xstat64; + +static void InitLibcFileIOFunctions() { + g_libc_fopen = reinterpret_cast<FopenFunction>( + dlsym(RTLD_NEXT, "fopen")); + g_libc_fopen64 = reinterpret_cast<FopenFunction>( + dlsym(RTLD_NEXT, "fopen64")); + + if (!g_libc_fopen) { + LOG(FATAL) << "Failed to get fopen() from libc."; + } else if (!g_libc_fopen64) { +#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD) + LOG(WARNING) << "Failed to get fopen64() from libc. Using fopen() instead."; +#endif // !defined(OS_OPENBSD) && !defined(OS_FREEBSD) + g_libc_fopen64 = g_libc_fopen; + } + + // TODO(sergeyu): This works only on systems with glibc. Fix it to + // work properly on other systems if necessary. + g_libc_xstat = reinterpret_cast<XstatFunction>( + dlsym(RTLD_NEXT, "__xstat")); + g_libc_xstat64 = reinterpret_cast<Xstat64Function>( + dlsym(RTLD_NEXT, "__xstat64")); + + if (!g_libc_xstat) { + LOG(FATAL) << "Failed to get __xstat() from libc."; + } + if (!g_libc_xstat64) { + LOG(WARNING) << "Failed to get __xstat64() from libc."; + } +} + +// fopen() and fopen64() are intercepted here so that NSS can open +// /dev/urandom to seed its random number generator. NSS is used by +// remoting in the sendbox. + +// fopen() call may be redirected to fopen64() in stdio.h using +// __REDIRECT(), which sets asm name for fopen() to "fopen64". This +// means that we cannot override fopen() directly here. Instead the +// the code below defines fopen_override() function with asm name +// "fopen", so that all references to fopen() will resolve to this +// function. +__attribute__ ((__visibility__("default"))) +FILE* fopen_override(const char* path, const char* mode) __asm__ ("fopen"); + +__attribute__ ((__visibility__("default"))) +FILE* fopen_override(const char* path, const char* mode) { + if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { + int fd = HANDLE_EINTR(dup(base::GetUrandomFD())); + if (fd < 0) { + PLOG(ERROR) << "dup() failed."; + return NULL; + } + return fdopen(fd, mode); + } else { + CHECK_EQ(0, pthread_once(&g_libc_file_io_funcs_guard, + InitLibcFileIOFunctions)); + return g_libc_fopen(path, mode); + } +} + +__attribute__ ((__visibility__("default"))) +FILE* fopen64(const char* path, const char* mode) { + if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { + int fd = HANDLE_EINTR(dup(base::GetUrandomFD())); + if (fd < 0) { + PLOG(ERROR) << "dup() failed."; + return NULL; + } + return fdopen(fd, mode); + } else { + CHECK_EQ(0, pthread_once(&g_libc_file_io_funcs_guard, + InitLibcFileIOFunctions)); + return g_libc_fopen64(path, mode); + } +} + +// stat() is subject to the same problem as fopen(), so we have to use +// the same trick to override it. +__attribute__ ((__visibility__("default"))) +int xstat_override(int version, + const char *path, + struct stat *buf) __asm__ ("__xstat"); + +__attribute__ ((__visibility__("default"))) +int xstat_override(int version, const char *path, struct stat *buf) { + if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { + int result = __fxstat(version, base::GetUrandomFD(), buf); + return result; + } else { + CHECK_EQ(0, pthread_once(&g_libc_file_io_funcs_guard, + InitLibcFileIOFunctions)); + return g_libc_xstat(version, path, buf); + } +} + +__attribute__ ((__visibility__("default"))) +int xstat64_override(int version, + const char *path, + struct stat64 *buf) __asm__ ("__xstat64"); + +__attribute__ ((__visibility__("default"))) +int xstat64_override(int version, const char *path, struct stat64 *buf) { + if (g_override_urandom && strcmp(path, kUrandomDevPath) == 0) { + int result = __fxstat64(version, base::GetUrandomFD(), buf); + return result; + } else { + CHECK_EQ(0, pthread_once(&g_libc_file_io_funcs_guard, + InitLibcFileIOFunctions)); + CHECK(g_libc_xstat64); + return g_libc_xstat64(version, path, buf); + } +} + +#endif // !ADDRESS_SANITIZER + +#endif // !CHROMIUM_SELINUX + +} // namespace content diff --git a/sandbox/linux/services/libc_urandom_override.h b/sandbox/linux/services/libc_urandom_override.h new file mode 100644 index 0000000..1990313 --- /dev/null +++ b/sandbox/linux/services/libc_urandom_override.h @@ -0,0 +1,18 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef SANDBOX_LINUX_SERVICES_LIBC_URANDOM_OVERRIDE_H_ +#define SANDBOX_LINUX_SERVICES_LIBC_URANDOM_OVERRIDE_H_ + +namespace sandbox { + +#if !defined(CHROMIUM_SELINUX) + +void InitLibcUrandomOverrides(); + +#endif // !CHROMIUM_SELINUX + +} // namespace sandbox + +#endif // SANDBOX_LINUX_SERVICES_LIBC_URANDOM_OVERRIDE_H_ diff --git a/sandbox/sandbox_linux.gypi b/sandbox/sandbox_linux.gypi index b3489ec..9cfb897 100644 --- a/sandbox/sandbox_linux.gypi +++ b/sandbox/sandbox_linux.gypi @@ -86,5 +86,19 @@ '..', ], }, + { + 'target_name': 'libc_urandom_override', + 'type': 'static_library', + 'sources': [ + 'linux/services/libc_urandom_override.cc', + 'linux/services/libc_urandom_override.h', + ], + 'dependencies': [ + '../base/base.gyp:base', + ], + 'include_dirs': [ + '..', + ], + }, ], } |