<!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>[213564] 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/213564">213564</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2017-03-07 20:49:26 -0800 (Tue, 07 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac][WK2] Whitelist iokit-get-properties
https://bugs.webkit.org/show_bug.cgi?id=169331
<rdar://problem/16363632>
Reviewed by Alex Christensen.
Block access to all IOKit properties by default. Turn on only those properties
that are actually needed by our engine.
* DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in:
* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
* PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in:
* WebProcess/com.apple.WebProcess.sb.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessmaccomappleWebKitDatabasessbin">trunk/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin">trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmaccomappleWebKitplugincommonsbin">trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscomappleWebProcesssbin">trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213563 => 213564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-08 03:54:28 UTC (rev 213563)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-08 04:49:26 UTC (rev 213564)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-03-07 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac][WK2] Whitelist iokit-get-properties
+ https://bugs.webkit.org/show_bug.cgi?id=169331
+ <rdar://problem/16363632>
+
+ Reviewed by Alex Christensen.
+
+ Block access to all IOKit properties by default. Turn on only those properties
+ that are actually needed by our engine.
+
+ * DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in:
+ * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
+ * PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in:
+ * WebProcess/com.apple.WebProcess.sb.in:
+
</ins><span class="cx"> 2017-03-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable SubpixelAntialiasedLayerTextEnabled by default on some versions of macOS
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessmaccomappleWebKitDatabasessbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in (213563 => 213564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in 2017-03-08 03:54:28 UTC (rev 213563)
+++ trunk/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in 2017-03-08 04:49:26 UTC (rev 213564)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> "hw.ncpu"
</span><span class="cx"> "hw.model"
</span><span class="cx"> "kern.memorystatus_level"))
</span><ins>+
+(deny iokit-get-properties)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ;; Utility functions for home directory relative path filters
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in (213563 => 213564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2017-03-08 03:54:28 UTC (rev 213563)
+++ trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2017-03-08 04:49:26 UTC (rev 213564)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> "hw.ncpu"
</span><span class="cx"> "hw.model"
</span><span class="cx"> "kern.memorystatus_level"))
</span><ins>+
+(deny iokit-get-properties)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ;; Utility functions for home directory relative path filters
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmaccomappleWebKitplugincommonsbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in (213563 => 213564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in 2017-03-08 03:54:28 UTC (rev 213563)
+++ trunk/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in 2017-03-08 04:49:26 UTC (rev 213564)
</span><span class="lines">@@ -40,6 +40,33 @@
</span><span class="cx"> "hw.ncpu"
</span><span class="cx"> "hw.model"
</span><span class="cx"> "kern.memorystatus_level"))
</span><ins>+
+(deny iokit-get-properties)
+(allow iokit-get-properties
+ (iokit-property "AllowDisplaySleep")
+ (iokit-property "DisplayRouting")
+ (iokit-property-regex #"^IOAudioControl(ChannelID|ID|SubType|Usage)")
+ (iokit-property-regex #"^IOAudioDevice(CanBeDefaults|TransportType)")
+ (iokit-property-regex #"^IOAudioEngine(ChannelNames|ClientDescription|CoreAudioPlugIn|Description|Flavor|GlobalUniqueID|OutputChannelLayout|SampleOffset|State)")
+ (iokit-property-regex #"^IOAudioEngineClock(Domain|IsStable)")
+ (iokit-property "IOAudioEngineDisableClockBoundsCheck")
+ (iokit-property-regex #"^IOAudioEngine(Input|Output)Sample(Latency|Offset)")
+ (iokit-property-regex #"^IOAudioEngineNum(ActiveUserClients|SampleFramesPerBuffer)")
+ (iokit-property "IOAudioSampleRate")
+ (iokit-property "IOAudioStreamSampleFormatByteOrder")
+ (iokit-property "IOClassNameOverride")
+ (iokit-property "IOConsoleUsers")
+ (iokit-property "IOFBCurrentPixelClock")
+ (iokit-property-regex #"^IOFBCurrentPixelCount(Real)")
+ (iokit-property "IOGeneralInterest")
+ (iokit-property "IOGLBundleName")
+ (iokit-property "IOScreenRestoreState")
+ (iokit-property "IOVARendererID")
+ (iokit-property-regex #"^MetalPlugin(Name|ClassName)")
+ (iokit-property "SupportAudioAUUC")
+ (iokit-property "board-id")
+ (iokit-property "idProduct")
+ (iokit-property "idVendor"))
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ;; Utility functions
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (213563 => 213564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2017-03-08 03:54:28 UTC (rev 213563)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2017-03-08 04:49:26 UTC (rev 213564)
</span><span class="lines">@@ -43,6 +43,60 @@
</span><span class="cx"> "hw.ncpu"
</span><span class="cx"> "hw.model"
</span><span class="cx"> "kern.memorystatus_level"))
</span><ins>+
+(deny iokit-get-properties)
+(allow iokit-get-properties
+ (iokit-property "AllowDisplaySleep")
+ (iokit-property "AAPL,mux-switch-state")
+ (iokit-property-regex #"^ATY,fb_(linebytes|offset|size)")
+ (iokit-property "CFBundleIdentifier")
+ (iokit-property "DisplayRouting")
+ (iokit-property-regex #"^IOAccel(Index|Types|Revision)")
+ (iokit-property-regex #"^IO(Class|MatchCategory|NameMatch)")
+ (iokit-property-regex #"^IOAudioControl(ChannelID|ID|SubType|Usage)")
+ (iokit-property-regex #"^IOAudioDevice(CanBeDefaults|TransportType)")
+ (iokit-property-regex #"^IOAudioEngine(ChannelNames|ClientDescription|CoreAudioPlugIn|Description|Flavor|GlobalUniqueID|OutputChannelLayout|SampleOffset|State)")
+ (iokit-property-regex #"^IOAudioEngineClock(Domain|IsStable)")
+ (iokit-property "IOAudioEngineDisableClockBoundsCheck")
+ (iokit-property-regex #"^IOAudioEngine(Input|Output)Sample(Latency|Offset)")
+ (iokit-property-regex #"^IOAudioEngineNum(ActiveUserClients|SampleFramesPerBuffer)")
+ (iokit-property "IOAudioSampleRate")
+ (iokit-property "IOAudioStreamSampleFormatByteOrder")
+ (iokit-property "IOCFPlugInTypes")
+ (iokit-property-regex #"^IOClass(|NameOverride)")
+ (iokit-property "IOConsoleUsers")
+ (iokit-property "IODVDBundleName")
+ (iokit-property "IODisplayParameters")
+ (iokit-property-regex #"^IOFB(CLUTDefer|Config|CursorInfo|Dependent(ID|Index))")
+ (iokit-property "IOFBCurrentPixelClock")
+ (iokit-property-regex #"^IOFBCurrentPixelCount(|Real)")
+ (iokit-property-regex #"^IOFB(DetailedTimings|Gamma(Count|HeaderSize|Width))")
+ (iokit-property-regex #"^IOFBI2CInterface(IDs|Info)")
+ (iokit-property-regex #"^IOFB(MemorySize|NeedsRefresh|ProbeOptions|ScalerInfo|TimingRange|Transform|UIScale|WaitCursor(Frames|Period))")
+ (iokit-property "IOFramebufferOpenGLIndex")
+ (iokit-property "IOGeneralInterest")
+ (iokit-property "IOGLBundleName")
+ (iokit-property-regex #"^IOGVA(Codec|EncoderRestricted)")
+ (iokit-property "IOMatchCategory")
+ (iokit-property-regex #"^IONameMatch(|ed)")
+ (iokit-property "IOPMStrictTreeOrder")
+ (iokit-property "IOPowerManagement")
+ (iokit-property "IOProbeScore")
+ (iokit-property "IOProviderClass")
+ (iokit-property "IOScreenRestoreState")
+ (iokit-property "IOVARendererID")
+ (iokit-property-regex #"^MetalPlugin(Name|ClassName)")
+ (iokit-property "Protocol Characteristics")
+ (iokit-property "SupportAudioAUUC")
+ (iokit-property-regex #"^audio-(codec-info|selector)")
+ (iokit-property "av-signal-type")
+ (iokit-property "board-id")
+ (iokit-property "boot-gamma-restored")
+ (iokit-property "graphic-options")
+ (iokit-property "idProduct")
+ (iokit-property "idVendor")
+ (iokit-property "iofb_version")
+ (iokit-property "startup-timing"))
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ;; Utility functions for home directory relative path filters
</span></span></pre>
</div>
</div>
</body>
</html>