Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: components/nacl/loader/nacl_fork_delegate_linux.cc

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make ios happy Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/app/nacl_fork_delegate_linux.h" 5 #include "components/nacl/common/nacl_fork_delegate_linux.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/resource.h> 9 #include <sys/resource.h>
10 #include <sys/socket.h> 10 #include <sys/socket.h>
11 11
12 #include <set> 12 #include <set>
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/posix/eintr_wrapper.h" 19 #include "base/posix/eintr_wrapper.h"
20 #include "base/posix/unix_domain_socket_linux.h" 20 #include "base/posix/unix_domain_socket_linux.h"
21 #include "base/process_util.h" 21 #include "base/process_util.h"
22 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 22 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
23 #include "chrome/common/chrome_paths.h" 23 #include "components/nacl/common/nacl_helper_linux.h"
24 #include "chrome/common/chrome_switches.h" 24 #include "components/nacl/common/nacl_paths.h"
25 #include "chrome/common/nacl_helper_linux.h" 25 #include "components/nacl/common/nacl_switches.h"
26 26
27 NaClForkDelegate::NaClForkDelegate() 27 NaClForkDelegate::NaClForkDelegate()
28 : status_(kNaClHelperUnused), 28 : status_(kNaClHelperUnused),
29 fd_(-1) {} 29 fd_(-1) {}
30 30
31 // Note these need to match up with their counterparts in nacl_helper_linux.c 31 // Note these need to match up with their counterparts in nacl_helper_linux.c
32 // and nacl_helper_bootstrap_linux.c. 32 // and nacl_helper_bootstrap_linux.c.
33 const char kNaClHelperReservedAtZero[] = 33 const char kNaClHelperReservedAtZero[] =
34 "--reserved_at_zero=0xXXXXXXXXXXXXXXXX"; 34 "--reserved_at_zero=0xXXXXXXXXXXXXXXXX";
35 const char kNaClHelperRDebug[] = "--r_debug=0xXXXXXXXXXXXXXXXX"; 35 const char kNaClHelperRDebug[] = "--r_debug=0xXXXXXXXXXXXXXXXX";
36 36
37 void NaClForkDelegate::Init(const int sandboxdesc) { 37 void NaClForkDelegate::Init(const int sandboxdesc) {
38 VLOG(1) << "NaClForkDelegate::Init()"; 38 VLOG(1) << "NaClForkDelegate::Init()";
39 int fds[2]; 39 int fds[2];
40 40
41 // Confirm a hard-wired assumption. 41 // Confirm a hard-wired assumption.
42 // The NaCl constant is from chrome/nacl/nacl_linux_helper.h 42 // The NaCl constant is from components/nacl/loader/nacl_linux_helper.h
43 DCHECK(kNaClSandboxDescriptor == sandboxdesc); 43 DCHECK(kNaClSandboxDescriptor == sandboxdesc);
44 44
45 CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0); 45 CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
46 base::FileHandleMappingVector fds_to_map; 46 base::FileHandleMappingVector fds_to_map;
47 fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor)); 47 fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor));
48 fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor)); 48 fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor));
49 49
50 status_ = kNaClHelperUnused; 50 status_ = kNaClHelperUnused;
51 base::FilePath helper_exe; 51 base::FilePath helper_exe;
52 base::FilePath helper_bootstrap_exe; 52 base::FilePath helper_bootstrap_exe;
53 if (!PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe)) { 53 if (!PathService::Get(nacl::FILE_NACL_HELPER, &helper_exe)) {
54 status_ = kNaClHelperMissing; 54 status_ = kNaClHelperMissing;
55 } else if (!PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP, 55 } else if (!PathService::Get(nacl::FILE_NACL_HELPER_BOOTSTRAP,
56 &helper_bootstrap_exe)) { 56 &helper_bootstrap_exe)) {
57 status_ = kNaClHelperBootstrapMissing; 57 status_ = kNaClHelperBootstrapMissing;
58 } else if (RunningOnValgrind()) { 58 } else if (RunningOnValgrind()) {
59 status_ = kNaClHelperValgrind; 59 status_ = kNaClHelperValgrind;
60 } else { 60 } else {
61 CommandLine cmd_line(helper_bootstrap_exe); 61 CommandLine cmd_line(helper_bootstrap_exe);
62 cmd_line.AppendArgPath(helper_exe); 62 cmd_line.AppendArgPath(helper_exe);
63 cmd_line.AppendArgNative(kNaClHelperReservedAtZero); 63 cmd_line.AppendArgNative(kNaClHelperReservedAtZero);
64 cmd_line.AppendArgNative(kNaClHelperRDebug); 64 cmd_line.AppendArgNative(kNaClHelperRDebug);
65 base::LaunchOptions options; 65 base::LaunchOptions options;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 155
156 bool NaClForkDelegate::AckChild(const int fd, 156 bool NaClForkDelegate::AckChild(const int fd,
157 const std::string& channel_switch) { 157 const std::string& channel_switch) {
158 int nwritten = HANDLE_EINTR(write(fd, channel_switch.c_str(), 158 int nwritten = HANDLE_EINTR(write(fd, channel_switch.c_str(),
159 channel_switch.length())); 159 channel_switch.length()));
160 if (nwritten != static_cast<int>(channel_switch.length())) { 160 if (nwritten != static_cast<int>(channel_switch.length())) {
161 return false; 161 return false;
162 } 162 }
163 return true; 163 return true;
164 } 164 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698