Changeset 164031 in webkit

Timestamp:

Feb 13, 2014 9:30:18 AM (10 years ago)

Author:

andersca@apple.com

Message:

Disable XPC for plug-ins that need executable heap
​https://bugs.webkit.org/show_bug.cgi?id=128744
<rdar://problem/15962958>

Reviewed by Dan Bernstein.

When switching to XPC for plug-ins, we accidentally broke the "feature"
where plug-ins can ask for the heap to be executable.

This breaks Silverlight, so just disable XPC for any plug-ins that need this.
<rdar://problem/16059483> tracks fixing this in the XPC service.

• UIProcess/Plugins/mac/PluginProcessProxyMac.mm:

(WebKit::PluginProcessProxy::pluginNeedsExecutableHeap):
Only return true for 32-bit plug-ins, since we don't know any 64-bit plug-ins
that require this feature.

(WebKit::PluginProcessProxy::platformGetLaunchOptions):
Set launchOptions.useXPC to false if launchOptions.executableHeap is true.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/mac/PluginProcessProxyMac.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-13  Anders Carlsson  <andersca@apple.com>
+
+        Disable XPC for plug-ins that need executable heap
+        https://bugs.webkit.org/show_bug.cgi?id=128744
+        <rdar://problem/15962958>
+
+        Reviewed by Dan Bernstein.
+
+        When switching to XPC for plug-ins, we accidentally broke the "feature"
+        where plug-ins can ask for the heap to be executable. 
+        
+        This breaks Silverlight, so just disable XPC for any plug-ins that need this.
+        <rdar://problem/16059483> tracks fixing this in the XPC service.
+
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        (WebKit::PluginProcessProxy::pluginNeedsExecutableHeap):
+        Only return true for 32-bit plug-ins, since we don't know any 64-bit plug-ins
+        that require this feature.
+
+        (WebKit::PluginProcessProxy::platformGetLaunchOptions):
+        Set launchOptions.useXPC to false if launchOptions.executableHeap is true.
+
 2014-02-12  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm

@@ -68 +68 @@
     if (pluginInfo.bundleIdentifier == "com.apple.QuickTime Plugin.plugin")
         return false;
-    
-    return true;
+
+    // We only allow 32-bit plug-ins to have the heap marked executable.
+    if (pluginInfo.pluginArchitecture == CPU_TYPE_X86)
+        return true;
+
+    return false;
 }
 
@@ -144 +148 @@
         launchOptions.extraInitializationData.add("disable-sandbox", "1");
 
-    launchOptions.useXPC = shouldUseXPC();
+    // FIXME: We should still use XPC for plug-ins that want the heap to be executable, see <rdar://problem/16059483>.
+    launchOptions.useXPC = shouldUseXPC() && !launchOptions.executableHeap;
 }