Title: [237190] trunk/Source/WebKit
- Revision
- 237190
- Author
- [email protected]
- Date
- 2018-10-16 10:52:24 -0700 (Tue, 16 Oct 2018)
Log Message
[GTK][WPE] Fix sandbox on distros with suid bubblewrap
https://bugs.webkit.org/show_bug.cgi?id=190616
Patch by Patrick Griffis <[email protected]> on 2018-10-16
Reviewed by Michael Catanzaro.
* UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
(WebKit::bubblewrapSpawn):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (237189 => 237190)
--- trunk/Source/WebKit/ChangeLog 2018-10-16 17:49:00 UTC (rev 237189)
+++ trunk/Source/WebKit/ChangeLog 2018-10-16 17:52:24 UTC (rev 237190)
@@ -1,3 +1,13 @@
+2018-10-16 Patrick Griffis <[email protected]>
+
+ [GTK][WPE] Fix sandbox on distros with suid bubblewrap
+ https://bugs.webkit.org/show_bug.cgi?id=190616
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+ (WebKit::bubblewrapSpawn):
+
2018-10-16 Alex Christensen <[email protected]>
Replace HistoryItem* with HistoryItem& where possible
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (237189 => 237190)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2018-10-16 17:49:00 UTC (rev 237189)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2018-10-16 17:52:24 UTC (rev 237190)
@@ -666,6 +666,15 @@
// We would have to parse ld config files for more info.
bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");
+ const char* libraryPath = g_getenv("LD_LIBRARY_PATH");
+ if (libraryPath && libraryPath[0]) {
+ // On distros using a suid bwrap it drops this env var
+ // so we have to pass it through to the children.
+ sandboxArgs.appendVector(Vector<CString>({
+ "--setenv", "LD_LIBRARY_PATH", libraryPath,
+ }));
+ }
+
bindSymlinksRealPath(sandboxArgs, "/etc/resolv.conf");
bindSymlinksRealPath(sandboxArgs, "/etc/localtime");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
