<!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>[280345] trunk/Source/WebKit</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/280345">280345</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-07-27 11:14:23 -0700 (Tue, 27 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix WebProcess sandbox profile when ENABLE_SANDBOX_MESSAGE_FILTER is disabled
https://bugs.webkit.org/show_bug.cgi?id=228220

Patch by Saagar Jha <saagar@saagarjha.com> on 2021-07-27
Reviewed by Per Arne Vollan.

A couple of new filters turn into empty lists when ENABLE_SANDBOX_MESSAGE_FILTER is NO;
we shouldn't be evaluating them at all, so we need to move the check out.

* WebProcess/com.apple.WebProcess.sb.in: Factor the conditional check out of the filters.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcesscomappleWebProcesssbin">trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (280344 => 280345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-07-27 18:00:44 UTC (rev 280344)
+++ trunk/Source/WebKit/ChangeLog       2021-07-27 18:14:23 UTC (rev 280345)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-07-27  Saagar Jha  <saagar@saagarjha.com>
+
+        Fix WebProcess sandbox profile when ENABLE_SANDBOX_MESSAGE_FILTER is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=228220
+
+        Reviewed by Per Arne Vollan.
+
+        A couple of new filters turn into empty lists when ENABLE_SANDBOX_MESSAGE_FILTER is NO;
+        we shouldn't be evaluating them at all, so we need to move the check out.
+
+        * WebProcess/com.apple.WebProcess.sb.in: Factor the conditional check out of the filters.
+
</ins><span class="cx"> 2021-07-26  Said Abou-Hallawa  <said@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Regulate the WebPage RenderingUpdates from the WebProcess to the GPUProcess
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in (280344 => 280345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in        2021-07-27 18:00:44 UTC (rev 280344)
+++ trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in   2021-07-27 18:14:23 UTC (rev 280345)
</span><span class="lines">@@ -239,37 +239,31 @@
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> (define (AppleAVDUserClientMessageFilter)
</span><del>-    (if (equal? (param "ENABLE_SANDBOX_MESSAGE_FILTER") "YES")
-        (apply-message-filter
-            (allow (with telemetry) (with message "AppleAVDUserClient")
-                iokit-async-external-method
-                iokit-external-method
-                iokit-external-trap
-            )
</del><ins>+    (apply-message-filter
+        (allow (with telemetry) (with message "AppleAVDUserClient")
+            iokit-async-external-method
+            iokit-external-method
+            iokit-external-trap
</ins><span class="cx">         )
</span><span class="cx">     )
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> (define (IOSurfaceAcceleratorClientMessageFilter)
</span><del>-    (if (equal? (param "ENABLE_SANDBOX_MESSAGE_FILTER") "YES")
-        (apply-message-filter
-            (allow (with telemetry) (with message "IOSurfaceAcceleratorClient")
-                iokit-async-external-method
-                iokit-external-method
-                iokit-external-trap
-            )
</del><ins>+    (apply-message-filter
+        (allow (with telemetry) (with message "IOSurfaceAcceleratorClient")
+            iokit-async-external-method
+            iokit-external-method
+            iokit-external-trap
</ins><span class="cx">         )
</span><span class="cx">     )
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> (define (IOMobileFramebufferUserClientMessageFilter)
</span><del>-    (if (equal? (param "ENABLE_SANDBOX_MESSAGE_FILTER") "YES")
-        (apply-message-filter
-            (allow (with telemetry-backtrace) (with message "IOMobileFramebufferUserClient")
-                iokit-async-external-method
-                iokit-external-method
-                iokit-external-trap
-            )
</del><ins>+    (apply-message-filter
+        (allow (with telemetry-backtrace) (with message "IOMobileFramebufferUserClient")
+            iokit-async-external-method
+            iokit-external-method
+            iokit-external-trap
</ins><span class="cx">         )
</span><span class="cx">     )
</span><span class="cx"> )
</span><span class="lines">@@ -1265,38 +1259,71 @@
</span><span class="cx"> 
</span><span class="cx"> ;; <rdar://problem/60088861>
</span><span class="cx"> (when (equal? (param "CPU") "arm64")
</span><del>-    (allow iokit-open
-        (require-all
-            (extension "com.apple.webkit.extension.iokit")
-            (iokit-user-client-class
-                "AppleAVDUserClient"
</del><ins>+    (if (equal? (param "ENABLE_SANDBOX_MESSAGE_FILTER") "YES")
+        (allow iokit-open
+            (require-all
+                (extension "com.apple.webkit.extension.iokit")
+                (iokit-user-client-class
+                    "AppleAVDUserClient"
+                )
</ins><span class="cx">             )
</span><del>-        )
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
</span><del>-        (AppleAVDUserClientMessageFilter)
</del><ins>+            (AppleAVDUserClientMessageFilter)
</ins><span class="cx"> #endif
</span><ins>+        )
+        ; else
+        (allow iokit-open
+            (require-all
+                (extension "com.apple.webkit.extension.iokit")
+                (iokit-user-client-class
+                    "AppleAVDUserClient"
+                )
+            )
+        )
</ins><span class="cx">     )
</span><del>-    (allow iokit-open
-        (require-all
-            (extension "com.apple.webkit.extension.iokit")
-            (iokit-user-client-class
-                "IOMobileFramebufferUserClient"
</del><ins>+    (if (equal? (param "ENABLE_SANDBOX_MESSAGE_FILTER") "YES")
+        (allow iokit-open
+            (require-all
+                (extension "com.apple.webkit.extension.iokit")
+                (iokit-user-client-class
+                    "IOMobileFramebufferUserClient"
+                )
</ins><span class="cx">             )
</span><del>-        )
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
</span><del>-        (IOMobileFramebufferUserClientMessageFilter)
</del><ins>+            (IOMobileFramebufferUserClientMessageFilter)
</ins><span class="cx"> #endif
</span><ins>+        )
+        ; else
+        (allow iokit-open
+            (require-all
+                (extension "com.apple.webkit.extension.iokit")
+                (iokit-user-client-class
+                    "IOMobileFramebufferUserClient"
+                )
+            )
+        )
</ins><span class="cx">     )
</span><del>-    (allow iokit-open
-        (require-all
-            (extension "com.apple.webkit.extension.iokit")
-            (iokit-user-client-class
-                "IOSurfaceAcceleratorClient" ;; <rdar://problem/63696732>
</del><ins>+    (if (equal? (param "ENABLE_SANDBOX_MESSAGE_FILTER") "YES")
+        (allow iokit-open
+            (require-all
+                (extension "com.apple.webkit.extension.iokit")
+                (iokit-user-client-class
+                    "IOSurfaceAcceleratorClient" ;; <rdar://problem/63696732>
+                )
</ins><span class="cx">             )
</span><del>-        )
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
</span><del>-        (IOSurfaceAcceleratorClientMessageFilter)
</del><ins>+            (IOSurfaceAcceleratorClientMessageFilter)
</ins><span class="cx"> #endif
</span><ins>+        )
+        ; else
+        (allow iokit-open
+            (require-all
+                (extension "com.apple.webkit.extension.iokit")
+                (iokit-user-client-class
+                    "IOSurfaceAcceleratorClient" ;; <rdar://problem/63696732>
+                )
+            )
+        )
</ins><span class="cx">     )
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="lines">@@ -2193,27 +2220,49 @@
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> (when (equal? (param "CPU") "arm64")
</span><del>-    (allow iokit-open (with report)
-        (require-all
-            (require-not (extension "com.apple.webkit.extension.iokit"))
-            (iokit-user-client-class
-                "AppleAVDUserClient"
</del><ins>+    (if (equal? (param "ENABLE_SANDBOX_MESSAGE_FILTER") "YES")
+        (allow iokit-open (with report)
+            (require-all
+                (require-not (extension "com.apple.webkit.extension.iokit"))
+                (iokit-user-client-class
+                    "AppleAVDUserClient"
+                )
</ins><span class="cx">             )
</span><del>-        )
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
</span><del>-        (AppleAVDUserClientMessageFilter)
</del><ins>+            (AppleAVDUserClientMessageFilter)
</ins><span class="cx"> #endif
</span><ins>+        )
+        ; else
+        (allow iokit-open (with report)
+            (require-all
+                (require-not (extension "com.apple.webkit.extension.iokit"))
+                (iokit-user-client-class
+                    "AppleAVDUserClient"
+                )
+            )
+        )
</ins><span class="cx">     )
</span><del>-    (allow iokit-open (with report)
-        (require-all
-            (require-not (extension "com.apple.webkit.extension.iokit"))
-            (iokit-user-client-class
-                "IOSurfaceAcceleratorClient"
</del><ins>+    (if (equal? (param "ENABLE_SANDBOX_MESSAGE_FILTER") "YES")
+        (allow iokit-open (with report)
+            (require-all
+                (require-not (extension "com.apple.webkit.extension.iokit"))
+                (iokit-user-client-class
+                    "IOSurfaceAcceleratorClient"
+                )
</ins><span class="cx">             )
</span><del>-        )
</del><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
</span><del>-        (IOSurfaceAcceleratorClientMessageFilter)
</del><ins>+            (IOSurfaceAcceleratorClientMessageFilter)
</ins><span class="cx"> #endif
</span><ins>+        )
+        ; else
+        (allow iokit-open (with report)
+            (require-all
+                (require-not (extension "com.apple.webkit.extension.iokit"))
+                (iokit-user-client-class
+                    "IOSurfaceAcceleratorClient"
+                )
+            )
+        )
</ins><span class="cx">     )
</span><span class="cx"> )
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>