Title: [186802] trunk/Source/WebKit2
Revision
186802
Author
[email protected]
Date
2015-07-14 08:35:48 -0700 (Tue, 14 Jul 2015)

Log Message

[Linux] SeccompFilters: whitelist source directory on all ports
https://bugs.webkit.org/show_bug.cgi?id=140066

Reviewed by Žan Doberšek.

Move this from EFL to port-independent code.

* Shared/linux/SeccompFilters/SyscallPolicy.cpp:
(WebKit::SyscallPolicy::addDefaultWebProcessPolicy):
* WebProcess/efl/SeccompFiltersWebProcessEfl.cpp:
(WebKit::SeccompFiltersWebProcessEfl::platformInitialize):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (186801 => 186802)


--- trunk/Source/WebKit2/ChangeLog	2015-07-14 08:53:30 UTC (rev 186801)
+++ trunk/Source/WebKit2/ChangeLog	2015-07-14 15:35:48 UTC (rev 186802)
@@ -1,3 +1,17 @@
+2015-07-14  Michael Catanzaro  <[email protected]>
+
+        [Linux] SeccompFilters: whitelist source directory on all ports
+        https://bugs.webkit.org/show_bug.cgi?id=140066
+
+        Reviewed by Žan Doberšek.
+
+        Move this from EFL to port-independent code.
+
+        * Shared/linux/SeccompFilters/SyscallPolicy.cpp:
+        (WebKit::SyscallPolicy::addDefaultWebProcessPolicy):
+        * WebProcess/efl/SeccompFiltersWebProcessEfl.cpp:
+        (WebKit::SeccompFiltersWebProcessEfl::platformInitialize):
+
 2015-07-14  Zan Dobersek  <[email protected]>
 
         [GTK] Add a runtime check for X11 display in webkitWebViewBaseExitAcceleratedCompositingMode()

Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp (186801 => 186802)


--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp	2015-07-14 08:53:30 UTC (rev 186801)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp	2015-07-14 15:35:48 UTC (rev 186802)
@@ -238,6 +238,17 @@
     // Needed by NVIDIA proprietary graphics driver
     if (homeDir)
         addDirectoryPermission(String::fromUTF8(homeDir) + "/.nv", ReadAndWrite);
+
+#if ENABLE(DEVELOPER_MODE) && defined(SOURCE_DIR)
+    // Developers using build-webkit expect some libraries to be loaded
+    // from the build root directory and they also need access to layout test
+    // files.
+    char* sourceDir = canonicalize_file_name(SOURCE_DIR);
+    if (sourceDir) {
+        addDirectoryPermission(String::fromUTF8(sourceDir), SyscallPolicy::ReadAndWrite);
+        free(sourceDir);
+    }
+#endif
 }
 
 } // namespace WebKit

Modified: trunk/Source/WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.cpp (186801 => 186802)


--- trunk/Source/WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.cpp	2015-07-14 08:53:30 UTC (rev 186801)
+++ trunk/Source/WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.cpp	2015-07-14 15:35:48 UTC (rev 186802)
@@ -55,18 +55,6 @@
     m_policy.addDirectoryPermission(ASCIILiteral("/sys/devices"), SyscallPolicy::Read);
     m_policy.addFilePermission(ASCIILiteral("/etc/udev/udev.conf"), SyscallPolicy::Read);
 
-#ifdef SOURCE_DIR
-    // Developers using build-webkit --efl expect some libraries to be loaded
-    // from the build root directory and they also need access to layout test
-    // files. The constant is defined only when jhbuild is detected, which is
-    // an indication of a development build.
-    char* sourceDir = canonicalize_file_name(SOURCE_DIR);
-    if (sourceDir) {
-        m_policy.addDirectoryPermission(String::fromUTF8(sourceDir), SyscallPolicy::ReadAndWrite);
-        free(sourceDir);
-    }
-#endif
-
     // Place where the theme and icons are installed.
     char* dataDir = canonicalize_file_name(DATA_DIR);
     if (dataDir) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to