| Index: chrome/nacl/nacl_listener.cc
|
| diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc
|
| deleted file mode 100644
|
| index 7562daa3629b3dfd7c3e4278b7d123c2a7ca05bc..0000000000000000000000000000000000000000
|
| --- a/chrome/nacl/nacl_listener.cc
|
| +++ /dev/null
|
| @@ -1,336 +0,0 @@
|
| -// 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 "chrome/nacl/nacl_listener.h"
|
| -
|
| -#include <errno.h>
|
| -#include <stdlib.h>
|
| -
|
| -#if defined(OS_POSIX)
|
| -#include <unistd.h>
|
| -#endif
|
| -
|
| -#include "base/command_line.h"
|
| -#include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "base/rand_util.h"
|
| -#include "chrome/nacl/nacl_ipc_adapter.h"
|
| -#include "chrome/nacl/nacl_validation_db.h"
|
| -#include "chrome/nacl/nacl_validation_query.h"
|
| -#include "components/nacl/common/nacl_messages.h"
|
| -#include "ipc/ipc_channel_handle.h"
|
| -#include "ipc/ipc_switches.h"
|
| -#include "ipc/ipc_sync_channel.h"
|
| -#include "ipc/ipc_sync_message_filter.h"
|
| -#include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
|
| -#include "native_client/src/trusted/validator/nacl_file_info.h"
|
| -
|
| -#if defined(OS_POSIX)
|
| -#include "base/file_descriptor_posix.h"
|
| -#endif
|
| -
|
| -#if defined(OS_LINUX)
|
| -#include "content/public/common/child_process_sandbox_support_linux.h"
|
| -#endif
|
| -
|
| -#if defined(OS_WIN)
|
| -#include <fcntl.h>
|
| -#include <io.h>
|
| -
|
| -#include "content/public/common/sandbox_init.h"
|
| -#endif
|
| -
|
| -namespace {
|
| -#if defined(OS_MACOSX)
|
| -
|
| -// On Mac OS X, shm_open() works in the sandbox but does not give us
|
| -// an FD that we can map as PROT_EXEC. Rather than doing an IPC to
|
| -// get an executable SHM region when CreateMemoryObject() is called,
|
| -// we preallocate one on startup, since NaCl's sel_ldr only needs one
|
| -// of them. This saves a round trip.
|
| -
|
| -base::subtle::Atomic32 g_shm_fd = -1;
|
| -
|
| -int CreateMemoryObject(size_t size, int executable) {
|
| - if (executable && size > 0) {
|
| - int result_fd = base::subtle::NoBarrier_AtomicExchange(&g_shm_fd, -1);
|
| - if (result_fd != -1) {
|
| - // ftruncate() is disallowed by the Mac OS X sandbox and
|
| - // returns EPERM. Luckily, we can get the same effect with
|
| - // lseek() + write().
|
| - if (lseek(result_fd, size - 1, SEEK_SET) == -1) {
|
| - LOG(ERROR) << "lseek() failed: " << errno;
|
| - return -1;
|
| - }
|
| - if (write(result_fd, "", 1) != 1) {
|
| - LOG(ERROR) << "write() failed: " << errno;
|
| - return -1;
|
| - }
|
| - return result_fd;
|
| - }
|
| - }
|
| - // Fall back to NaCl's default implementation.
|
| - return -1;
|
| -}
|
| -
|
| -#elif defined(OS_LINUX)
|
| -
|
| -int CreateMemoryObject(size_t size, int executable) {
|
| - return content::MakeSharedMemorySegmentViaIPC(size, executable);
|
| -}
|
| -
|
| -#elif defined(OS_WIN)
|
| -
|
| -NaClListener* g_listener;
|
| -
|
| -// We wrap the function to convert the bool return value to an int.
|
| -int BrokerDuplicateHandle(NaClHandle source_handle,
|
| - uint32_t process_id,
|
| - NaClHandle* target_handle,
|
| - uint32_t desired_access,
|
| - uint32_t options) {
|
| - return content::BrokerDuplicateHandle(source_handle, process_id,
|
| - target_handle, desired_access,
|
| - options);
|
| -}
|
| -
|
| -int AttachDebugExceptionHandler(const void* info, size_t info_size) {
|
| - std::string info_string(reinterpret_cast<const char*>(info), info_size);
|
| - bool result = false;
|
| - if (!g_listener->Send(new NaClProcessMsg_AttachDebugExceptionHandler(
|
| - info_string, &result)))
|
| - return false;
|
| - return result;
|
| -}
|
| -
|
| -#endif
|
| -
|
| -} // namespace
|
| -
|
| -class BrowserValidationDBProxy : public NaClValidationDB {
|
| - public:
|
| - explicit BrowserValidationDBProxy(NaClListener* listener)
|
| - : listener_(listener) {
|
| - }
|
| -
|
| - virtual bool QueryKnownToValidate(const std::string& signature) OVERRIDE {
|
| - // Initialize to false so that if the Send fails to write to the return
|
| - // value we're safe. For example if the message is (for some reason)
|
| - // dispatched as an async message the return parameter will not be written.
|
| - bool result = false;
|
| - if (!listener_->Send(new NaClProcessMsg_QueryKnownToValidate(signature,
|
| - &result))) {
|
| - LOG(ERROR) << "Failed to query NaCl validation cache.";
|
| - result = false;
|
| - }
|
| - return result;
|
| - }
|
| -
|
| - virtual void SetKnownToValidate(const std::string& signature) OVERRIDE {
|
| - // Caching is optional: NaCl will still work correctly if the IPC fails.
|
| - if (!listener_->Send(new NaClProcessMsg_SetKnownToValidate(signature))) {
|
| - LOG(ERROR) << "Failed to update NaCl validation cache.";
|
| - }
|
| - }
|
| -
|
| - virtual bool ResolveFileToken(struct NaClFileToken* file_token,
|
| - int32* fd, std::string* path) OVERRIDE {
|
| - *fd = -1;
|
| - *path = "";
|
| - if (file_token->lo == 0 && file_token->hi == 0) {
|
| - return false;
|
| - }
|
| - IPC::PlatformFileForTransit ipc_fd = IPC::InvalidPlatformFileForTransit();
|
| - base::FilePath ipc_path;
|
| - if (!listener_->Send(new NaClProcessMsg_ResolveFileToken(file_token->lo,
|
| - file_token->hi,
|
| - &ipc_fd,
|
| - &ipc_path))) {
|
| - return false;
|
| - }
|
| - if (ipc_fd == IPC::InvalidPlatformFileForTransit()) {
|
| - return false;
|
| - }
|
| - base::PlatformFile handle =
|
| - IPC::PlatformFileForTransitToPlatformFile(ipc_fd);
|
| -#if defined(OS_WIN)
|
| - // On Windows, valid handles are 32 bit unsigned integers so this is safe.
|
| - *fd = reinterpret_cast<uintptr_t>(handle);
|
| -#else
|
| - *fd = handle;
|
| -#endif
|
| - // It doesn't matter if the path is invalid UTF8 as long as it's consistent
|
| - // and unforgeable.
|
| - *path = ipc_path.AsUTF8Unsafe();
|
| - return true;
|
| - }
|
| -
|
| - private:
|
| - // The listener never dies, otherwise this might be a dangling reference.
|
| - NaClListener* listener_;
|
| -};
|
| -
|
| -
|
| -NaClListener::NaClListener() : shutdown_event_(true, false),
|
| - io_thread_("NaCl_IOThread"),
|
| -#if defined(OS_LINUX)
|
| - prereserved_sandbox_size_(0),
|
| -#endif
|
| -#if defined(OS_POSIX)
|
| - number_of_cores_(-1), // unknown/error
|
| -#endif
|
| - main_loop_(NULL) {
|
| - io_thread_.StartWithOptions(
|
| - base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
|
| -#if defined(OS_WIN)
|
| - DCHECK(g_listener == NULL);
|
| - g_listener = this;
|
| -#endif
|
| -}
|
| -
|
| -NaClListener::~NaClListener() {
|
| - NOTREACHED();
|
| - shutdown_event_.Signal();
|
| -#if defined(OS_WIN)
|
| - g_listener = NULL;
|
| -#endif
|
| -}
|
| -
|
| -bool NaClListener::Send(IPC::Message* msg) {
|
| - DCHECK(main_loop_ != NULL);
|
| - if (base::MessageLoop::current() == main_loop_) {
|
| - // This thread owns the channel.
|
| - return channel_->Send(msg);
|
| - } else {
|
| - // This thread does not own the channel.
|
| - return filter_->Send(msg);
|
| - }
|
| -}
|
| -
|
| -void NaClListener::Listen() {
|
| - std::string channel_name =
|
| - CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| - switches::kProcessChannelID);
|
| - channel_.reset(new IPC::SyncChannel(
|
| - this, io_thread_.message_loop_proxy().get(), &shutdown_event_));
|
| - filter_ = new IPC::SyncMessageFilter(&shutdown_event_);
|
| - channel_->AddFilter(filter_.get());
|
| - channel_->Init(channel_name, IPC::Channel::MODE_CLIENT, true);
|
| - main_loop_ = base::MessageLoop::current();
|
| - main_loop_->Run();
|
| -}
|
| -
|
| -bool NaClListener::OnMessageReceived(const IPC::Message& msg) {
|
| - bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP(NaClListener, msg)
|
| - IPC_MESSAGE_HANDLER(NaClProcessMsg_Start, OnStart)
|
| - IPC_MESSAGE_UNHANDLED(handled = false)
|
| - IPC_END_MESSAGE_MAP()
|
| - return handled;
|
| -}
|
| -
|
| -void NaClListener::OnStart(const nacl::NaClStartParams& params) {
|
| - struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
|
| - if (args == NULL) {
|
| - LOG(ERROR) << "NaClChromeMainArgsCreate() failed";
|
| - return;
|
| - }
|
| -
|
| - if (params.enable_ipc_proxy) {
|
| - // Create the initial PPAPI IPC channel between the NaCl IRT and the
|
| - // browser process. The IRT uses this channel to communicate with the
|
| - // browser and to create additional IPC channels to renderer processes.
|
| - IPC::ChannelHandle handle =
|
| - IPC::Channel::GenerateVerifiedChannelID("nacl");
|
| - scoped_refptr<NaClIPCAdapter> ipc_adapter(
|
| - new NaClIPCAdapter(handle, io_thread_.message_loop_proxy().get()));
|
| - ipc_adapter->ConnectChannel();
|
| -
|
| - // Pass a NaClDesc to the untrusted side. This will hold a ref to the
|
| - // NaClIPCAdapter.
|
| - args->initial_ipc_desc = ipc_adapter->MakeNaClDesc();
|
| -#if defined(OS_POSIX)
|
| - handle.socket = base::FileDescriptor(
|
| - ipc_adapter->TakeClientFileDescriptor(), true);
|
| -#endif
|
| - if (!Send(new NaClProcessHostMsg_PpapiChannelCreated(handle)))
|
| - LOG(ERROR) << "Failed to send IPC channel handle to NaClProcessHost.";
|
| - }
|
| -
|
| - std::vector<nacl::FileDescriptor> handles = params.handles;
|
| -
|
| -#if defined(OS_LINUX) || defined(OS_MACOSX)
|
| - args->urandom_fd = dup(base::GetUrandomFD());
|
| - if (args->urandom_fd < 0) {
|
| - LOG(ERROR) << "Failed to dup() the urandom FD";
|
| - return;
|
| - }
|
| - args->number_of_cores = number_of_cores_;
|
| - args->create_memory_object_func = CreateMemoryObject;
|
| -# if defined(OS_MACOSX)
|
| - CHECK(handles.size() >= 1);
|
| - g_shm_fd = nacl::ToNativeHandle(handles[handles.size() - 1]);
|
| - handles.pop_back();
|
| -# endif
|
| -#endif
|
| -
|
| - if (params.uses_irt) {
|
| - CHECK(handles.size() >= 1);
|
| - NaClHandle irt_handle = nacl::ToNativeHandle(handles[handles.size() - 1]);
|
| - handles.pop_back();
|
| -
|
| -#if defined(OS_WIN)
|
| - args->irt_fd = _open_osfhandle(reinterpret_cast<intptr_t>(irt_handle),
|
| - _O_RDONLY | _O_BINARY);
|
| - if (args->irt_fd < 0) {
|
| - LOG(ERROR) << "_open_osfhandle() failed";
|
| - return;
|
| - }
|
| -#else
|
| - args->irt_fd = irt_handle;
|
| -#endif
|
| - } else {
|
| - // Otherwise, the IRT handle is not even sent.
|
| - args->irt_fd = -1;
|
| - }
|
| -
|
| - if (params.validation_cache_enabled) {
|
| - // SHA256 block size.
|
| - CHECK_EQ(params.validation_cache_key.length(), (size_t) 64);
|
| - // The cache structure is not freed and exists until the NaCl process exits.
|
| - args->validation_cache = CreateValidationCache(
|
| - new BrowserValidationDBProxy(this), params.validation_cache_key,
|
| - params.version);
|
| - }
|
| -
|
| - CHECK(handles.size() == 1);
|
| - args->imc_bootstrap_handle = nacl::ToNativeHandle(handles[0]);
|
| - args->enable_exception_handling = params.enable_exception_handling;
|
| - args->enable_debug_stub = params.enable_debug_stub;
|
| - args->enable_dyncode_syscalls = params.enable_dyncode_syscalls;
|
| - if (!params.enable_dyncode_syscalls) {
|
| - // Bound the initial nexe's code segment size under PNaCl to
|
| - // reduce the chance of a code spraying attack succeeding (see
|
| - // https://code.google.com/p/nativeclient/issues/detail?id=3572).
|
| - // We assume that !params.enable_dyncode_syscalls is synonymous
|
| - // with PNaCl. We can't apply this arbitrary limit outside of
|
| - // PNaCl because it might break existing NaCl apps, and this limit
|
| - // is only useful if the dyncode syscalls are disabled.
|
| - args->initial_nexe_max_code_bytes = 32 << 20; // 32 MB
|
| - }
|
| -#if defined(OS_LINUX) || defined(OS_MACOSX)
|
| - args->debug_stub_server_bound_socket_fd = nacl::ToNativeHandle(
|
| - params.debug_stub_server_bound_socket);
|
| -#endif
|
| -#if defined(OS_WIN)
|
| - args->broker_duplicate_handle_func = BrokerDuplicateHandle;
|
| - args->attach_debug_exception_handler_func = AttachDebugExceptionHandler;
|
| -#endif
|
| -#if defined(OS_LINUX)
|
| - args->prereserved_sandbox_size = prereserved_sandbox_size_;
|
| -#endif
|
| - NaClChromeMainStart(args);
|
| - NOTREACHED();
|
| -}
|
|
|