<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182021] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182021">182021</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-26 12:00:05 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Linux] SeccompFilters: improve the port-agnostic whitelist
https://bugs.webkit.org/show_bug.cgi?id=140064
Patch by Michael Catanzaro <mcatanzaro@igalia.com> on 2015-03-26
Reviewed by Žan Doberšek.
Allow the web process to access several files and directories that it
was previously prohibited from accessing. This makes the web process
much less likely to break.
* Shared/linux/SeccompFilters/SyscallPolicy.cpp:
(WebKit::SyscallPolicy::addDefaultWebProcessPolicy):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedlinuxSeccompFiltersSyscallPolicycpp">trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182020 => 182021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-26 18:49:40 UTC (rev 182020)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-26 19:00:05 UTC (rev 182021)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-26 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [Linux] SeccompFilters: improve the port-agnostic whitelist
+ https://bugs.webkit.org/show_bug.cgi?id=140064
+
+ Reviewed by Žan Doberšek.
+
+ Allow the web process to access several files and directories that it
+ was previously prohibited from accessing. This makes the web process
+ much less likely to break.
+
+ * Shared/linux/SeccompFilters/SyscallPolicy.cpp:
+ (WebKit::SyscallPolicy::addDefaultWebProcessPolicy):
+
</ins><span class="cx"> 2015-03-26 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unneeded isConditionalRequest check from NetworkResourceLoader
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedlinuxSeccompFiltersSyscallPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp (182020 => 182021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp 2015-03-26 18:49:40 UTC (rev 182020)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.cpp 2015-03-26 19:00:05 UTC (rev 182021)
</span><span class="lines">@@ -135,7 +135,11 @@
</span><span class="cx">
</span><span class="cx"> // Shared libraries, plugins and fonts.
</span><span class="cx"> addDirectoryPermission(ASCIILiteral("/lib"), Read);
</span><ins>+ addDirectoryPermission(ASCIILiteral("/lib32"), Read);
+ addDirectoryPermission(ASCIILiteral("/lib64"), Read);
</ins><span class="cx"> addDirectoryPermission(ASCIILiteral("/usr/lib"), Read);
</span><ins>+ addDirectoryPermission(ASCIILiteral("/usr/lib32"), Read);
+ addDirectoryPermission(ASCIILiteral("/usr/lib64"), Read);
</ins><span class="cx"> addDirectoryPermission(ASCIILiteral("/usr/share"), Read);
</span><span class="cx">
</span><span class="cx"> // SSL Certificates.
</span><span class="lines">@@ -186,13 +190,50 @@
</span><span class="cx"> // Needed by D-Bus.
</span><span class="cx"> addFilePermission(ASCIILiteral("/var/lib/dbus/machine-id"), Read);
</span><span class="cx">
</span><ins>+ // Needed by at-spi2.
+ // FIXME This is too permissive: https://bugs.webkit.org/show_bug.cgi?id=143004
+ addDirectoryPermission("/run/user/" + String::number(getuid()), ReadAndWrite);
+
+ // Needed by WebKit's memory pressure handler
+ addFilePermission(ASCIILiteral("/sys/fs/cgroup/memory/memory.pressure_level"), Read);
+ addFilePermission(ASCIILiteral("/sys/fs/cgroup/memory/cgroup.event_control"), Read);
+
</ins><span class="cx"> char* homeDir = getenv("HOME");
</span><span class="cx"> if (homeDir) {
</span><span class="cx"> // X11 connection token.
</span><span class="cx"> addFilePermission(String::fromUTF8(homeDir) + "/.Xauthority", Read);
</span><del>- // MIME type resolution.
- addDirectoryPermission(String::fromUTF8(homeDir) + "/.local/share/mime", Read);
</del><span class="cx"> }
</span><ins>+
+ // MIME type resolution.
+ char* dataHomeDir = getenv("XDG_DATA_HOME");
+ if (dataHomeDir)
+ addDirectoryPermission(String::fromUTF8(dataHomeDir) + "/mime", Read);
+ else if (homeDir)
+ addDirectoryPermission(String::fromUTF8(homeDir) + "/.local/share/mime", Read);
+
+#if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS)
+ // Needed on most non-Debian distros by libxshmfence <= 1.1, or newer
+ // libxshmfence with older kernels (linux <= 3.16), for DRI3 shared memory.
+ // FIXME Try removing this permission when we can rely on a newer libxshmfence.
+ // See http://code.google.com/p/chromium/issues/detail?id=415681
+ addDirectoryPermission(ASCIILiteral("/var/tmp"), ReadAndWrite);
+
+ // Optional Mesa DRI configuration file
+ addFilePermission(ASCIILiteral("/etc/drirc"), Read);
+ if (homeDir)
+ addFilePermission(String::fromUTF8(homeDir) + "/.drirc", Read);
+
+ // Mesa uses udev.
+ addDirectoryPermission(ASCIILiteral("/etc/udev"), Read);
+ addDirectoryPermission(ASCIILiteral("/run/udev"), Read);
+ addDirectoryPermission(ASCIILiteral("/sys/bus"), Read);
+ addDirectoryPermission(ASCIILiteral("/sys/class"), Read);
+ addDirectoryPermission(ASCIILiteral("/sys/devices"), Read);
+#endif
+
+ // Needed by NVIDIA proprietary graphics driver
+ if (homeDir)
+ addDirectoryPermission(String::fromUTF8(homeDir) + "/.nv", ReadAndWrite);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>