Title: [250231] trunk/Source/WebKit
- Revision
- 250231
- Author
- pgrif...@igalia.com
- Date
- 2019-09-23 06:59:49 -0700 (Mon, 23 Sep 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (250230 => 250231)
--- trunk/Source/WebKit/ChangeLog 2019-09-23 10:42:18 UTC (rev 250230)
+++ trunk/Source/WebKit/ChangeLog 2019-09-23 13:59:49 UTC (rev 250231)
@@ -1,3 +1,17 @@
+2019-09-23 Patrick Griffis <pgrif...@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 <mcatanz...@igalia.com>
[SOUP] Stop setting G_TLS_GNUTLS_PRIORITY
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (250230 => 250231)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-23 10:42:18 UTC (rev 250230)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-23 13:59:49 UTC (rev 250231)
@@ -30,6 +30,12 @@
#include <wtf/glib/GRefPtr.h>
#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>)
#include <sys/memfd.h>
@@ -129,7 +135,7 @@
if (!dbusPath.get())
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();
m_socket = dbusAddress;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
