[Win10 sandbox mitigations] MITIGATION_NONSYSTEM_FONT_DISABLE adjustment.

content/common/sandbox_win.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 "content/common/sandbox_win.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 682 matching lines @@
 
   sandbox::TargetPolicy* policy = g_broker_services->CreatePolicy();
 
   // Pre-startup mitigations.
   sandbox::MitigationFlags mitigations =
       sandbox::MITIGATION_HEAP_TERMINATE |
       sandbox::MITIGATION_BOTTOM_UP_ASLR |
       sandbox::MITIGATION_DEP |
       sandbox::MITIGATION_DEP_NO_ATL_THUNK |
       sandbox::MITIGATION_SEHOP |
-      sandbox::MITIGATION_NONSYSTEM_FONT_DISABLE |
       sandbox::MITIGATION_IMAGE_LOAD_NO_REMOTE |
       sandbox::MITIGATION_IMAGE_LOAD_NO_LOW_LABEL;
+#if !defined(NACL_WIN64)
+  // Only enable for DirectWrite, not GDI.
+  if (gfx::win::ShouldUseDirectWrite())
+    mitigations |= sandbox::MITIGATION_NONSYSTEM_FONT_DISABLE;
+#endif

[Will Harris, 2016/02/23 05:46:02]

for the NACL_WIN64 case, I think we can always enable
andbox::MITIGATION_NONSYSTEM_FONT_DISABLE

[penny, 2016/02/23 21:24:56]

Done.

 
   if (policy->SetProcessMitigations(mitigations) != sandbox::SBOX_ALL_OK)
     return base::Process();
 
 #if !defined(NACL_WIN64)
   if (type_str == switches::kRendererProcess &&
       IsWin32kRendererLockdownEnabled()) {
     if (!AddWin32kLockdownPolicy(policy))
       return base::Process();
   }
@@ skipping 144 matching lines @@
   }
 
   return false;
 }
 
 bool BrokerAddTargetPeer(HANDLE peer_process) {
   return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content