Attachment 243953 Details for Bug 140066 – Patch

[patch] Patch

0003-Linux-SeccompFilters-whitelist-source-directory-on-a.patch (text/plain), 3.66 KB, created by Michael Catanzaro on 2015-01-04 19:22:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2015-01-04 19:22:49 PST

Size: 3.66 KB

patch

obsolete

>From af34490e1d7aa022633d55076170e08eee446d13 Mon Sep 17 00:00:00 2001
>From: Michael Catanzaro <mcatanzaro@igalia.com>
>Date: Sat, 27 Dec 2014 14:14:08 -0600
>Subject: [PATCH 3/3] [Linux] SeccompFilters: whitelist source directory on all
> ports
>
>---
> Source/WebKit2/ChangeLog                                   | 14 ++++++++++++++
> .../WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp  | 12 ++++++++++++
> .../WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.cpp | 12 ------------
> 3 files changed, 26 insertions(+), 12 deletions(-)
>
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 55d3f1c..1dd358a 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,5 +1,19 @@
> 2015-01-04  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>+        [Linux] SeccompFilters: whitelist source directory on all ports
>+        https://bugs.webkit.org/show_bug.cgi?id=140066
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Move this from EFL to port-independent code.
>+
>+        * Shared/linux/SeccompFilters/SyscallPolicy.cpp:
>+        (WebKit::SyscallPolicy::addDefaultWebProcessPolicy):
>+        * WebProcess/efl/SeccompFiltersWebProcessEfl.cpp:
>+        (WebKit::SeccompFiltersWebProcessEfl::platformInitialize):
>+
>+2015-01-04  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>         [Linux] SeccompFilters: handle alternate install prefixes
>         https://bugs.webkit.org/show_bug.cgi?id=140065
> 
>diff --git a/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp b/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp
>index c33099e..f7ac221 100644
>--- a/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp
>+++ b/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp
>@@ -233,6 +233,18 @@ void SyscallPolicy::addDefaultWebProcessPolicy(const WebProcessCreationParameter
>     // Needed by NVIDIA proprietary graphics driver
>     if (homeDir)
>         addDirectoryPermission(String::fromUTF8(homeDir) + "/.nv", Read);
>+
>+#ifdef 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. 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) {
>+        addDirectoryPermission(String::fromUTF8(sourceDir), SyscallPolicy::ReadAndWrite);
>+        free(sourceDir);
>+    }
>+#endif
> }
> 
> } // namespace WebKit
>diff --git a/Source/WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.cpp b/Source/WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.cpp
>index d49e0be..d93c0b1 100644
>--- a/Source/WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.cpp
>+++ b/Source/WebKit2/WebProcess/efl/SeccompFiltersWebProcessEfl.cpp
>@@ -55,18 +55,6 @@ void SeccompFiltersWebProcessEfl::platformInitialize()
>     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) {
>-- 
>2.1.0
>

Actions: View | Formatted Diff | Diff

Attachments on bug 140066: 243953 | 249296 | 256701 | 256769