Bug 1314801 Part 1: Compile chromium sandbox features that require at least UCRT SDK version 10.0.10586.0. r=jimm
authorBob Owen <bobowencode@gmail.com>
Wed, 13 Sep 2017 11:19:41 +0100
changeset 430160 aaf411b9d99f48e25811b131c59c557ce9077d60
parent 430159 0ddab9b0527d8c66b95880fce6f0c64a1bea6057
child 430161 ac48944bf3c6f274037225a92d230f996a309963
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1314801, 10586
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1314801 Part 1: Compile chromium sandbox features that require at least UCRT SDK version 10.0.10586.0. r=jimm
security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
--- a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
+++ b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc
@@ -147,19 +147,16 @@ bool ApplyProcessMitigationsToCurrentPro
         ERROR_ACCESS_DENIED != ::GetLastError()) {
       return false;
     }
   }
 
   if (version < base::win::VERSION_WIN10)
     return true;
 
-// We don't currently use the code below and including it means we will need
-// the Windows 10 SDK to build, with which there are currently issues.
-#if !defined(MOZ_SANDBOX)
   // Enable font policies.
   if (flags & MITIGATION_NONSYSTEM_FONT_DISABLE) {
     PROCESS_MITIGATION_FONT_DISABLE_POLICY policy = {};
     policy.DisableNonSystemFonts = true;
 
     if (!set_process_mitigation_policy(ProcessFontDisablePolicy, &policy,
                                        sizeof(policy)) &&
         ERROR_ACCESS_DENIED != ::GetLastError()) {
@@ -180,17 +177,16 @@ bool ApplyProcessMitigationsToCurrentPro
       policy.NoLowMandatoryLabelImages = true;
 
     if (!set_process_mitigation_policy(ProcessImageLoadPolicy, &policy,
                                        sizeof(policy)) &&
         ERROR_ACCESS_DENIED != ::GetLastError()) {
       return false;
     }
   }
-#endif
 
   return true;
 }
 
 void ConvertProcessMitigationsToPolicy(MitigationFlags flags,
                                        DWORD64* policy_flags,
                                        size_t* size) {
   base::win::Version version = base::win::GetVersion();