Changeset 212891 in webkit

Timestamp:

Feb 23, 2017 8:47:04 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Crash attempting to load Flash plugin in Wayland
​https://bugs.webkit.org/show_bug.cgi?id=163159

Reviewed by Michael Catanzaro.

The problem is that we check if the current diplay is X11 or Wayland also in the plugin process, but with GTK2
plugins the display is always X11. We should early reject plugins requiring GTK2 in the UI process when the
current display is Wayland.

• UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:

(WebKit::PluginInfoStore::getPluginInfo):

• UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:

(WebKit::PluginProcessProxy::scanPlugin):

• UIProcess/gtk/WebPageProxyGtk.cpp:

(WebKit::WebPageProxy::createPluginContainer): Add an assert to ensure this message is never received on a
non-X11 display.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::createPluginContainer): Never send CreatePluginContainer message to the UI process if the
display is not X11.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp (modified) (2 diffs)
• UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (modified) (2 diffs)
• UIProcess/gtk/WebPageProxyGtk.cpp (modified) (2 diffs)
• WebProcess/Plugins/PluginView.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-02-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Crash attempting to load Flash plugin in Wayland
+        https://bugs.webkit.org/show_bug.cgi?id=163159
+
+        Reviewed by Michael Catanzaro.
+
+        The problem is that we check if the current diplay is X11 or Wayland also in the plugin process, but with GTK2
+        plugins the display is always X11. We should early reject plugins requiring GTK2 in the UI process when the
+        current display is Wayland.
+
+        * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:
+        (WebKit::PluginInfoStore::getPluginInfo):
+        * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+        (WebKit::PluginProcessProxy::scanPlugin):
+        * UIProcess/gtk/WebPageProxyGtk.cpp:
+        (WebKit::WebPageProxy::createPluginContainer): Add an assert to ensure this message is never received on a
+        non-X11 display.
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::createPluginContainer): Never send CreatePluginContainer message to the UI process if the
+        display is not X11.
+
 2017-02-23  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp

@@ -36 +36 @@
 #include "ProcessExecutablePath.h"
 #include <WebCore/FileSystem.h>
+#include <WebCore/PlatformDisplay.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -76 +77 @@
 #if ENABLE(PLUGIN_PROCESS_GTK2)
         if (plugin.requiresGtk2) {
+            if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
+                return false;
             String pluginProcessPath = executablePathOfPluginProcess();
             pluginProcessPath.append('2');

trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp

@@ -34 +34 @@
 #include "ProcessExecutablePath.h"
 #include <WebCore/FileSystem.h>
+#include <WebCore/PlatformDisplay.h>
 #include <sys/wait.h>
 #include <wtf/text/CString.h>
@@ -85 +86 @@
     bool requiresGtk2 = pluginRequiresGtk2(pluginPath);
     if (requiresGtk2) {
+        if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
+            return false;
 #if ENABLE(PLUGIN_PROCESS_GTK2)
         pluginProcessPath.append('2');

trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp

@@ -35 +35 @@
 #include "WebProcessProxy.h"
 #include "WebsiteDataStore.h"
+#include <WebCore/PlatformDisplay.h>
 #include <WebCore/UserAgent.h>
 #include <gtk/gtkx.h>
@@ -103 +104 @@
 void WebPageProxy::createPluginContainer(uint64_t& windowID)
 {
+    RELEASE_ASSERT(WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::X11);
     GtkWidget* socket = gtk_socket_new();
     g_signal_connect(socket, "plug-removed", G_CALLBACK(pluginContainerPlugRemoved), 0);

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -73 +73 @@
 #include <wtf/text/StringBuilder.h>
 
+#if PLUGIN_ARCHITECTURE(X11)
+#include <WebCore/PlatformDisplay.h>
+#endif
+
 using namespace JSC;
 using namespace WebCore;
@@ -1678 +1682 @@
 {
     uint64_t windowID = 0;
-    m_webPage->sendSync(Messages::WebPageProxy::CreatePluginContainer(), Messages::WebPageProxy::CreatePluginContainer::Reply(windowID));
+    if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::X11)
+        m_webPage->sendSync(Messages::WebPageProxy::CreatePluginContainer(), Messages::WebPageProxy::CreatePluginContainer::Reply(windowID));
     return windowID;
 }