Backed out changeset 60f9b60f1f4f (bug 1347710) for causing bug 1526661. a=backout
authorDaniel Varga <dvarga@mozilla.com>
Sat, 09 Feb 2019 20:13:30 +0200
changeset 516255 14ee0b7ecef3
parent 516254 ec61d092ed67
child 516271 0eb73752cf21
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1347710, 1526661
milestone67.0a1
backs out60f9b60f1f4f
first release with
nightly win32
14ee0b7ecef3 / 67.0a1 / 20190209181359 / files
nightly win64
14ee0b7ecef3 / 67.0a1 / 20190209181359 / files
nightly linux32
nightly linux64
nightly mac
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly win32
nightly win64
Backed out changeset 60f9b60f1f4f (bug 1347710) for causing bug 1526661. a=backout
browser/app/profile/firefox.js
gfx/ipc/GPUProcessHost.cpp
security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1027,17 +1027,17 @@ pref("security.sandbox.content.level", 5
 pref("security.sandbox.windows.log.stackTraceDepth", 0);
 #endif
 
 // This controls the strength of the Windows GPU process sandbox.  Changes
 // will require restart.
 // For information on what the level number means, see
 // SetSecurityLevelForGPUProcess() in
 // security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
-pref("security.sandbox.gpu.level", 1);
+pref("security.sandbox.gpu.level", 0);
 
 // Controls whether we disable win32k for the processes.
 // true means that win32k system calls are not permitted.
 pref("security.sandbox.rdd.win32k-disable", true);
 // Note: win32k is currently _not_ disabled for GMP due to intermittent test
 // failures, where the GMP process fails very early. See bug 1449348.
 pref("security.sandbox.gmp.win32k-disable", false);
 #endif
--- a/gfx/ipc/GPUProcessHost.cpp
+++ b/gfx/ipc/GPUProcessHost.cpp
@@ -31,26 +31,17 @@ GPUProcessHost::GPUProcessHost(Listener*
 GPUProcessHost::~GPUProcessHost() { MOZ_COUNT_DTOR(GPUProcessHost); }
 
 bool GPUProcessHost::Launch(StringVector aExtraOpts) {
   MOZ_ASSERT(mLaunchPhase == LaunchPhase::Unlaunched);
   MOZ_ASSERT(!mGPUChild);
   MOZ_ASSERT(!gfxPlatform::IsHeadless());
 
 #if defined(XP_WIN) && defined(MOZ_SANDBOX)
-  // If the user disables the VR process, the VR thread will run in the 
-  // the GPU process. The GPU sandbox may not work and should be disabled in 
-  // this case.
-  // This is a temporary workaround until VR process is stable. It should be
-  // removed once VR process is firmly in release.
-  if (gfxPrefs::VRProcessEnabled()) {
-    mSandboxLevel = Preferences::GetInt("security.sandbox.gpu.level");
-  } else {
-    mSandboxLevel = 0;
-  }
+  mSandboxLevel = Preferences::GetInt("security.sandbox.gpu.level");
 #endif
 
   mLaunchPhase = LaunchPhase::Waiting;
   mLaunchTime = TimeStamp::Now();
 
   if (!GeckoChildProcessHost::AsyncLaunch(aExtraOpts)) {
     mLaunchPhase = LaunchPhase::Complete;
     return false;
--- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
+++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
@@ -596,17 +596,17 @@ void SandboxBroker::SetSecurityLevelForG
   // avoid changing their meaning.
   MOZ_RELEASE_ASSERT(aSandboxLevel >= 1,
                      "Should not be called with aSandboxLevel < 1");
   if (aSandboxLevel >= 2) {
     jobLevel = sandbox::JOB_NONE;
     accessTokenLevel = sandbox::USER_LIMITED;
     initialIntegrityLevel = sandbox::INTEGRITY_LEVEL_LOW;
     delayedIntegrityLevel = sandbox::INTEGRITY_LEVEL_LOW;
-  } else {    
+  } else if (aSandboxLevel == 1) {
     jobLevel = sandbox::JOB_NONE;
     accessTokenLevel = sandbox::USER_NON_ADMIN;
     initialIntegrityLevel = sandbox::INTEGRITY_LEVEL_LOW;
     delayedIntegrityLevel = sandbox::INTEGRITY_LEVEL_LOW;
   }
 
   sandbox::ResultCode result =
       SetJobLevel(mPolicy, jobLevel, 0 /* ui_exceptions */);