From 3f6d9fc88db233b90b60933c458b51070be8ba08 Mon Sep 17 00:00:00 2001 From: "mseaborn@chromium.org" Date: Thu, 10 Jan 2013 17:45:02 +0000 Subject: NaCl: Clean up file descriptor setup in nacl_helper on linux There is no need to be using dup2() to set up an FD with a fixed number; this risks overwriting an FD. The point of base::GlobalDescriptors is that it provides a level of indirection that allows any FD number to be used. Remove kNaClBrowserDescriptor. Remove the browserdesc argument that is not used for anything other than an assertion and so isn't needed. BUG=https://code.google.com/p/nativeclient/issues/detail?id=2096 TEST=NaCl tests in browser_tests Review URL: https://codereview.chromium.org/11819021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176106 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/nacl/nacl_helper_linux.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'chrome/nacl') diff --git a/chrome/nacl/nacl_helper_linux.cc b/chrome/nacl/nacl_helper_linux.cc index a5cb131..3c6fb8ff 100644 --- a/chrome/nacl/nacl_helper_linux.cc +++ b/chrome/nacl/nacl_helper_linux.cc @@ -43,14 +43,8 @@ void BecomeNaClLoader(const std::vector& child_fds, // don't need zygote FD any more if (HANDLE_EINTR(close(kNaClZygoteDescriptor)) != 0) LOG(ERROR) << "close(kNaClZygoteDescriptor) failed."; - // Set up browser descriptor on fd 3 and IPC as expected by Chrome. base::GlobalDescriptors::GetInstance()->Set(kPrimaryIPCChannel, - kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); - int zfd = dup2(child_fds[kNaClBrowserFDIndex], kNaClBrowserDescriptor); - if (zfd != kNaClBrowserDescriptor) { - LOG(ERROR) << "Could not initialize kNaClBrowserDescriptor"; - _exit(-1); - } + child_fds[kNaClBrowserFDIndex]); MessageLoopForIO main_message_loop; NaClListener listener; -- cgit v1.1