Namespace sandbox: add check for unprivileged use of CLONE_NEWUSER

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

 // 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/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 #include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h"
@@ skipping 11 matching lines @@
 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom.h"
 #include "ui/display/screen.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/wm/core/wm_state.h"
 #endif  // defined(USE_AURA)
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "base/command_line.h"
 #include "chrome/browser/ui/simple_message_box.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "content/public/common/content_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 
 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
 }
 
 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {
   constrained_window::SetConstrainedWindowViewsClient(nullptr);
 }
 
@@ skipping 22 matching lines @@
 #if defined(USE_AURA)
   // IME driver must be available at login screen, so initialize before profile.
   if (service_manager::ServiceManagerIsRemote())
     IMEDriver::Register();
 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // On the Linux desktop, we want to prevent the user from logging in as root,
   // so that we don't destroy the profile. Now that we have some minimal ui
   // initialized, check to see if we're running as root and bail if we are.
-  if (getuid() != 0)
+  if (geteuid() != 0)
     return;
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kUserDataDir))
+  if (command_line.HasSwitch(switches::kNoSandbox))
     return;
 
   base::string16 title = l10n_util::GetStringFUTF16(
       IDS_REFUSE_TO_RUN_AS_ROOT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   base::string16 message = l10n_util::GetStringFUTF16(
       IDS_REFUSE_TO_RUN_AS_ROOT_2, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 
   chrome::ShowWarningMessageBox(NULL, title, message);
 
   // Avoids gpu_process_transport_factory.cc(153)] Check failed:
@@ skipping 23 matching lines @@
     // WMState is owned as a member, so don't have MusClient create it.
     const bool create_wm_state = false;
     mus_client_ = base::MakeUnique<views::MusClient>(
         connection->GetConnector(), connection->GetIdentity(),
         content::BrowserThread::GetTaskRunnerForThread(
             content::BrowserThread::IO),
         create_wm_state);
   }
 #endif  // defined(USE_AURA)
 }