Changeset 250231 in webkit

Timestamp:

Sep 23, 2019 6:59:49 AM (5 years ago)

Author:

Patrick Griffis

Message:

[GTK][WPE] Don't use prgname in dbus-proxy socket path
​https://bugs.webkit.org/show_bug.cgi?id=201979

The path length for the socket is limited to 108 bytes so it is easy for a long
prgname to cause it to get truncated and fail. Since we only allow the socket
path into the sandbox the unique directory isn't necessary.

Reviewed by Michael Catanzaro.

• UIProcess/Launcher/glib/BubblewrapLauncher.cpp:

(WebKit::XDGDBusProxyLauncher::setAddress):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/glib/BubblewrapLauncher.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-23  Patrick Griffis  <pgriffis@igalia.com>
+
+        [GTK][WPE] Don't use prgname in dbus-proxy socket path
+        https://bugs.webkit.org/show_bug.cgi?id=201979
+
+        The path length for the socket is limited to 108 bytes so it is easy for a long
+        prgname to cause it to get truncated and fail. Since we only allow the socket
+        path into the sandbox the unique directory isn't necessary.
+
+        Reviewed by Michael Catanzaro.
+
+        * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+        (WebKit::XDGDBusProxyLauncher::setAddress):
+
 2019-09-23  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

@@ -31 +31 @@
 #include <wtf/glib/GUniquePtr.h>
 
+#if PLATFORM(GTK)
+#define BASE_DIRECTORY "webkitgtk"
+#elif PLATFORM(WPE)
+#define BASE_DIRECTORY "wpe"
+#endif
+
 #if __has_include(<sys/memfd.h>)
 
@@ -130 +136 @@
             return;
 
-        GUniquePtr<char> appRunDir(g_build_filename(g_get_user_runtime_dir(), g_get_prgname(), nullptr));
+        GUniquePtr<char> appRunDir(g_build_filename(g_get_user_runtime_dir(), BASE_DIRECTORY, nullptr));
         m_proxyPath = makeProxyPath(appRunDir.get()).get();